From 0975d97ca3a0bdba9cc0a34e62e9251272084487 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 2 Aug 2018 15:22:50 +0200 Subject: [PATCH] Apply sane PHP settings only via php.ini, not additionally via php-fpm.conf --- .../base/data/php-fpm.d/php-fpm.d-5.3.conf | 13 ------------- .../base/data/php-fpm.d/php-fpm.d-5.4.conf | 13 ------------- .../base/data/php-fpm.d/php-fpm.d-5.5.conf | 13 ------------- .../base/data/php-fpm.d/php-fpm.d-5.6.conf | 13 ------------- .../base/data/php-fpm.d/php-fpm.d-7.0.conf | 13 ------------- .../base/data/php-fpm.d/php-fpm.d-7.1.conf | 13 ------------- .../base/data/php-fpm.d/php-fpm.d-7.2.conf | 12 ------------ .../base/data/php-fpm.d/php-fpm.d-7.3.conf | 12 ------------ .../work/data/php-fpm.d/php-fpm.d-5.3.conf | 13 ------------- .../work/data/php-fpm.d/php-fpm.d-5.4.conf | 13 ------------- .../work/data/php-fpm.d/php-fpm.d-5.5.conf | 13 ------------- .../work/data/php-fpm.d/php-fpm.d-5.6.conf | 13 ------------- .../work/data/php-fpm.d/php-fpm.d-7.0.conf | 13 ------------- .../work/data/php-fpm.d/php-fpm.d-7.1.conf | 13 ------------- .../work/data/php-fpm.d/php-fpm.d-7.2.conf | 12 ------------ .../work/data/php-fpm.d/php-fpm.d-7.3.conf | 12 ------------ build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 | 16 ---------------- 17 files changed, 220 deletions(-) diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.3.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.3.conf index b99b2de..3d947a9 100644 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.3.conf +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.3.conf @@ -83,16 +83,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = Off -php_flag[display_startup_errors] = Off -php_flag[track_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.4.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.4.conf index 6ed8472..af26d25 100644 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.4.conf +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.4.conf @@ -85,16 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = Off -php_flag[display_startup_errors] = Off -php_flag[track_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.5.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.5.conf index 6ed8472..af26d25 100644 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.5.conf +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.5.conf @@ -85,16 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = Off -php_flag[display_startup_errors] = Off -php_flag[track_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.6.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.6.conf index 6ed8472..af26d25 100644 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.6.conf +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.6.conf @@ -85,16 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = Off -php_flag[display_startup_errors] = Off -php_flag[track_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.0.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.0.conf index 6ed8472..af26d25 100644 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.0.conf +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.0.conf @@ -85,16 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = Off -php_flag[display_startup_errors] = Off -php_flag[track_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.1.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.1.conf index 6ed8472..af26d25 100644 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.1.conf +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.1.conf @@ -85,16 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = Off -php_flag[display_startup_errors] = Off -php_flag[track_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.2.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.2.conf index ebff256..af26d25 100644 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.2.conf +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.2.conf @@ -85,15 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = Off -php_flag[display_startup_errors] = Off -php_flag[log_errors] = On -php_flag[html_errors] = Off diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.3.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.3.conf index ebff256..af26d25 100644 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.3.conf +++ b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.3.conf @@ -85,15 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = Off -php_flag[display_startup_errors] = Off -php_flag[log_errors] = On -php_flag[html_errors] = Off diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.3.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.3.conf index 325c0e4..3d947a9 100644 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.3.conf +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.3.conf @@ -83,16 +83,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = On -php_flag[display_startup_errors] = On -php_flag[track_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.4.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.4.conf index 9ba572b..af26d25 100644 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.4.conf +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.4.conf @@ -85,16 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = On -php_flag[display_startup_errors] = On -php_flag[track_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.5.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.5.conf index 9ba572b..af26d25 100644 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.5.conf +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.5.conf @@ -85,16 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = On -php_flag[display_startup_errors] = On -php_flag[track_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.6.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.6.conf index 9ba572b..af26d25 100644 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.6.conf +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.6.conf @@ -85,16 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = On -php_flag[display_startup_errors] = On -php_flag[track_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.0.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.0.conf index 9ba572b..af26d25 100644 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.0.conf +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.0.conf @@ -85,16 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = On -php_flag[display_startup_errors] = On -php_flag[track_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.1.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.1.conf index 9ba572b..af26d25 100644 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.1.conf +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.1.conf @@ -85,16 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = On -php_flag[display_startup_errors] = On -php_flag[track_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.2.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.2.conf index 5494b4b..af26d25 100644 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.2.conf +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.2.conf @@ -85,15 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = On -php_flag[display_startup_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = On diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.3.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.3.conf index 5494b4b..af26d25 100644 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.3.conf +++ b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.3.conf @@ -85,15 +85,3 @@ pm.max_requests = 500 [www] user = devilbox group = devilbox - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED -php_flag[xmlrpc_errors] = Off -php_flag[report_memleaks] = On -php_flag[display_errors] = On -php_flag[display_startup_errors] = On -php_flag[log_errors] = On -php_flag[html_errors] = On diff --git a/build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 b/build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 index 890196e..c186312 100644 --- a/build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 +++ b/build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 @@ -91,20 +91,4 @@ pm.max_requests = {{ item.cfg[item.key].pm_max_requests | default(item.cfg[item. [www] user = {{ item.cfg[item.key].user | default(item.cfg[item.alt].user) }} group = {{ item.cfg[item.key].group | default(item.cfg[item.alt].group) }} - - -; ############################################################ -; PHP settings -; ############################################################ -php_value[error_reporting] = {{ item.cfg[item.key].error_reporting | default(item.cfg[item.alt].error_reporting) }} -php_flag[xmlrpc_errors] = {{ item.cfg[item.key].xmlrpc_errors | default(item.cfg[item.alt].xmlrpc_errors) }} -php_flag[report_memleaks] = {{ item.cfg[item.key].report_memleaks | default(item.cfg[item.alt].report_memleaks) }} -php_flag[display_errors] = {{ item.cfg[item.key].display_errors | default(item.cfg[item.alt].display_errors) }} -php_flag[display_startup_errors] = {{ item.cfg[item.key].display_startup_errors | default(item.cfg[item.alt].display_startup_errors) }} -{# Only available before PHP 7.2 #} -{% 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 %} -php_flag[track_errors] = {{ item.cfg[item.key].track_errors | default(item.cfg[item.alt].track_errors) }} -{% endif %} -php_flag[log_errors] = {{ item.cfg[item.key].log_errors | default(item.cfg[item.alt].log_errors) }} -php_flag[html_errors] = {{ item.cfg[item.key].html_errors | default(item.cfg[item.alt].html_errors) }} {% endif %}