diff --git a/Dockerfiles/base/data/php.d/php-7.2.ini b/Dockerfiles/base/data/php.d/php-7.2.ini index b3de1ec..ae3a78c 100644 --- a/Dockerfiles/base/data/php.d/php-7.2.ini +++ b/Dockerfiles/base/data/php.d/php-7.2.ini @@ -38,5 +38,4 @@ xmlrpc_errors = Off report_memleaks = On display_errors = Off display_startup_errors = Off -track_errors = On log_errors = On diff --git a/Dockerfiles/base/data/php.d/php-7.3.ini b/Dockerfiles/base/data/php.d/php-7.3.ini index b3de1ec..ae3a78c 100644 --- a/Dockerfiles/base/data/php.d/php-7.3.ini +++ b/Dockerfiles/base/data/php.d/php-7.3.ini @@ -38,5 +38,4 @@ xmlrpc_errors = Off report_memleaks = On display_errors = Off display_startup_errors = Off -track_errors = On log_errors = On diff --git a/Dockerfiles/work/data/php.d/php-7.2.ini b/Dockerfiles/work/data/php.d/php-7.2.ini index ba7061a..a87a0ea 100644 --- a/Dockerfiles/work/data/php.d/php-7.2.ini +++ b/Dockerfiles/work/data/php.d/php-7.2.ini @@ -12,6 +12,5 @@ error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED display_errors = On display_startup_errors = On -track_errors = On log_errors = On html_errors = On diff --git a/Dockerfiles/work/data/php.d/php-7.3.ini b/Dockerfiles/work/data/php.d/php-7.3.ini index ba7061a..a87a0ea 100644 --- a/Dockerfiles/work/data/php.d/php-7.3.ini +++ b/Dockerfiles/work/data/php.d/php-7.3.ini @@ -12,6 +12,5 @@ error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED display_errors = On display_startup_errors = On -track_errors = On log_errors = On html_errors = On diff --git a/build/ansible/CONFIGURATION/php-base.ini b/build/ansible/CONFIGURATION/php-base.ini.j2 similarity index 85% rename from build/ansible/CONFIGURATION/php-base.ini rename to build/ansible/CONFIGURATION/php-base.ini.j2 index b3de1ec..655c2bd 100644 --- a/build/ansible/CONFIGURATION/php-base.ini +++ b/build/ansible/CONFIGURATION/php-base.ini.j2 @@ -38,5 +38,7 @@ xmlrpc_errors = Off report_memleaks = On display_errors = Off display_startup_errors = Off +{% if php_version == 5.2 or php_version == 5.3 or php_version == 5.4 or php_version == 5.5 or php_version == 5.6 or php_version == 7.0 or php_version == 7.1 %} track_errors = On +{% endif %} log_errors = On diff --git a/build/ansible/CONFIGURATION/php-prod.ini b/build/ansible/CONFIGURATION/php-prod.ini.j2 similarity index 100% rename from build/ansible/CONFIGURATION/php-prod.ini rename to build/ansible/CONFIGURATION/php-prod.ini.j2 diff --git a/build/ansible/CONFIGURATION/php-work.ini b/build/ansible/CONFIGURATION/php-work.ini.j2 similarity index 76% rename from build/ansible/CONFIGURATION/php-work.ini rename to build/ansible/CONFIGURATION/php-work.ini.j2 index ba7061a..4aa6904 100644 --- a/build/ansible/CONFIGURATION/php-work.ini +++ b/build/ansible/CONFIGURATION/php-work.ini.j2 @@ -12,6 +12,8 @@ error_reporting = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED display_errors = On display_startup_errors = On +{% if php_version == 5.2 or php_version == 5.3 or php_version == 5.4 or php_version == 5.5 or php_version == 5.6 or php_version == 7.0 or php_version == 7.1 %} track_errors = On +{% endif %} log_errors = On html_errors = On diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 1668617..e7c261e 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -13,11 +13,11 @@ template_files: # PHP.ini files to apply sane defaults ini_files: - - src: CONFIGURATION/php-base.ini + - src: CONFIGURATION/php-base.ini.j2 dst: "../../Dockerfiles/base/data/php.d/php-{{ php_version }}.ini" - - src: CONFIGURATION/php-prod.ini + - src: CONFIGURATION/php-prod.ini.j2 dst: "../../Dockerfiles/prod/data/php.d/php-{{ php_version }}.ini" - - src: CONFIGURATION/php-work.ini + - src: CONFIGURATION/php-work.ini.j2 dst: "../../Dockerfiles/work/data/php.d/php-{{ php_version }}.ini" diff --git a/build/ansible/roles/template/tasks/main.yml b/build/ansible/roles/template/tasks/main.yml index 72e799f..b4c3035 100644 --- a/build/ansible/roles/template/tasks/main.yml +++ b/build/ansible/roles/template/tasks/main.yml @@ -10,7 +10,7 @@ - "{{ template_files }}" - name: copy php.ini configuration - copy: + template: src: "{{ item.src }}" dest: "{{ item.dst }}" force: True