From cb176f5ebae6911fea7d11b0b7bdf8d660ada120 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 2 Aug 2018 20:37:08 +0200 Subject: [PATCH] Harden PHP-FPM defaults --- Dockerfiles/base/Dockerfile-5.2 | 1 - Dockerfiles/base/Dockerfile-5.3 | 1 - Dockerfiles/base/Dockerfile-5.4 | 1 - Dockerfiles/base/Dockerfile-5.5 | 1 - Dockerfiles/base/Dockerfile-5.6 | 1 - Dockerfiles/base/Dockerfile-7.0 | 1 - Dockerfiles/base/Dockerfile-7.1 | 1 - Dockerfiles/base/Dockerfile-7.2 | 1 - Dockerfiles/base/Dockerfile-7.3 | 1 - .../base/data/php-fpm.conf/php-fpm-5.2.conf | 20 +-- .../base/data/php-fpm.conf/php-fpm-5.3.conf | 118 ++++++++++++++- .../base/data/php-fpm.conf/php-fpm-5.4.conf | 120 +++++++++++++++- .../base/data/php-fpm.conf/php-fpm-5.5.conf | 120 +++++++++++++++- .../base/data/php-fpm.conf/php-fpm-5.6.conf | 120 +++++++++++++++- .../base/data/php-fpm.conf/php-fpm-7.0.conf | 120 +++++++++++++++- .../base/data/php-fpm.conf/php-fpm-7.1.conf | 120 +++++++++++++++- .../base/data/php-fpm.conf/php-fpm-7.2.conf | 120 +++++++++++++++- .../base/data/php-fpm.conf/php-fpm-7.3.conf | 120 +++++++++++++++- .../base/data/php-fpm.d/php-fpm.d-5.2.conf | 1 - .../base/data/php-fpm.d/php-fpm.d-5.3.conf | 85 ----------- .../base/data/php-fpm.d/php-fpm.d-5.4.conf | 87 ------------ .../base/data/php-fpm.d/php-fpm.d-5.5.conf | 87 ------------ .../base/data/php-fpm.d/php-fpm.d-5.6.conf | 87 ------------ .../base/data/php-fpm.d/php-fpm.d-7.0.conf | 87 ------------ .../base/data/php-fpm.d/php-fpm.d-7.1.conf | 87 ------------ .../base/data/php-fpm.d/php-fpm.d-7.2.conf | 87 ------------ .../base/data/php-fpm.d/php-fpm.d-7.3.conf | 87 ------------ Dockerfiles/base/data/php-ini.d/php-5.2.ini | 8 +- Dockerfiles/base/data/php-ini.d/php-5.3.ini | 8 +- Dockerfiles/base/data/php-ini.d/php-5.4.ini | 8 +- Dockerfiles/base/data/php-ini.d/php-5.5.ini | 8 +- Dockerfiles/base/data/php-ini.d/php-5.6.ini | 8 +- Dockerfiles/base/data/php-ini.d/php-7.0.ini | 8 +- Dockerfiles/base/data/php-ini.d/php-7.1.ini | 8 +- Dockerfiles/base/data/php-ini.d/php-7.2.ini | 8 +- Dockerfiles/base/data/php-ini.d/php-7.3.ini | 8 +- Dockerfiles/work/Dockerfile-5.2 | 1 - Dockerfiles/work/Dockerfile-5.3 | 1 - Dockerfiles/work/Dockerfile-5.4 | 1 - Dockerfiles/work/Dockerfile-5.5 | 1 - Dockerfiles/work/Dockerfile-5.6 | 1 - Dockerfiles/work/Dockerfile-7.0 | 1 - Dockerfiles/work/Dockerfile-7.1 | 1 - Dockerfiles/work/Dockerfile-7.2 | 1 - Dockerfiles/work/Dockerfile-7.3 | 1 - .../work/data/php-fpm.conf/php-fpm-5.2.conf | 20 +-- .../work/data/php-fpm.conf/php-fpm-5.3.conf | 118 ++++++++++++++- .../work/data/php-fpm.conf/php-fpm-5.4.conf | 120 +++++++++++++++- .../work/data/php-fpm.conf/php-fpm-5.5.conf | 120 +++++++++++++++- .../work/data/php-fpm.conf/php-fpm-5.6.conf | 120 +++++++++++++++- .../work/data/php-fpm.conf/php-fpm-7.0.conf | 120 +++++++++++++++- .../work/data/php-fpm.conf/php-fpm-7.1.conf | 120 +++++++++++++++- .../work/data/php-fpm.conf/php-fpm-7.2.conf | 120 +++++++++++++++- .../work/data/php-fpm.conf/php-fpm-7.3.conf | 120 +++++++++++++++- .../work/data/php-fpm.d/php-fpm.d-5.2.conf | 1 - .../work/data/php-fpm.d/php-fpm.d-5.3.conf | 85 ----------- .../work/data/php-fpm.d/php-fpm.d-5.4.conf | 87 ------------ .../work/data/php-fpm.d/php-fpm.d-5.5.conf | 87 ------------ .../work/data/php-fpm.d/php-fpm.d-5.6.conf | 87 ------------ .../work/data/php-fpm.d/php-fpm.d-7.0.conf | 87 ------------ .../work/data/php-fpm.d/php-fpm.d-7.1.conf | 87 ------------ .../work/data/php-fpm.d/php-fpm.d-7.2.conf | 87 ------------ .../work/data/php-fpm.d/php-fpm.d-7.3.conf | 87 ------------ Dockerfiles/work/data/php-ini.d/php-5.2.ini | 8 +- Dockerfiles/work/data/php-ini.d/php-5.3.ini | 8 +- Dockerfiles/work/data/php-ini.d/php-5.4.ini | 8 +- Dockerfiles/work/data/php-ini.d/php-5.5.ini | 8 +- Dockerfiles/work/data/php-ini.d/php-5.6.ini | 8 +- Dockerfiles/work/data/php-ini.d/php-7.0.ini | 8 +- Dockerfiles/work/data/php-ini.d/php-7.1.ini | 8 +- Dockerfiles/work/data/php-ini.d/php-7.2.ini | 8 +- Dockerfiles/work/data/php-ini.d/php-7.3.ini | 8 +- build/ansible/CONFIGURATIONS/php-fpm.conf.j2 | 134 ++++++++++++++++-- .../ansible/CONFIGURATIONS/php-fpm.d-conf.j2 | 94 ------------ build/ansible/DOCKERFILES/Dockerfile-base.j2 | 1 - build/ansible/DOCKERFILES/Dockerfile-work.j2 | 1 - build/ansible/group_vars/all.yml | 119 +++++----------- 77 files changed, 2137 insertions(+), 1720 deletions(-) delete mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.2.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.3.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.4.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.5.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.6.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.0.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.1.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.2.conf delete mode 100644 Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.3.conf delete mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.2.conf delete mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.3.conf delete mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.4.conf delete mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.5.conf delete mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.6.conf delete mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.0.conf delete mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.1.conf delete mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.2.conf delete mode 100644 Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.3.conf delete mode 100644 build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 diff --git a/Dockerfiles/base/Dockerfile-5.2 b/Dockerfiles/base/Dockerfile-5.2 index c8100f9..ce1a475 100644 --- a/Dockerfiles/base/Dockerfile-5.2 +++ b/Dockerfiles/base/Dockerfile-5.2 @@ -59,7 +59,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-5.2.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-5.2.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-5.2.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d diff --git a/Dockerfiles/base/Dockerfile-5.3 b/Dockerfiles/base/Dockerfile-5.3 index 4fcec30..8c8c31f 100644 --- a/Dockerfiles/base/Dockerfile-5.3 +++ b/Dockerfiles/base/Dockerfile-5.3 @@ -59,7 +59,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-5.3.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-5.3.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-5.3.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d diff --git a/Dockerfiles/base/Dockerfile-5.4 b/Dockerfiles/base/Dockerfile-5.4 index 10c22cd..275baa9 100644 --- a/Dockerfiles/base/Dockerfile-5.4 +++ b/Dockerfiles/base/Dockerfile-5.4 @@ -59,7 +59,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-5.4.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-5.4.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-5.4.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d diff --git a/Dockerfiles/base/Dockerfile-5.5 b/Dockerfiles/base/Dockerfile-5.5 index a9adade..bac875a 100644 --- a/Dockerfiles/base/Dockerfile-5.5 +++ b/Dockerfiles/base/Dockerfile-5.5 @@ -59,7 +59,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-5.5.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-5.5.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-5.5.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d diff --git a/Dockerfiles/base/Dockerfile-5.6 b/Dockerfiles/base/Dockerfile-5.6 index b15a4e9..8f6d41d 100644 --- a/Dockerfiles/base/Dockerfile-5.6 +++ b/Dockerfiles/base/Dockerfile-5.6 @@ -59,7 +59,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-5.6.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-5.6.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-5.6.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d diff --git a/Dockerfiles/base/Dockerfile-7.0 b/Dockerfiles/base/Dockerfile-7.0 index 314be17..0b897ca 100644 --- a/Dockerfiles/base/Dockerfile-7.0 +++ b/Dockerfiles/base/Dockerfile-7.0 @@ -59,7 +59,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-7.0.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-7.0.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-7.0.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d diff --git a/Dockerfiles/base/Dockerfile-7.1 b/Dockerfiles/base/Dockerfile-7.1 index 92f9912..6882cb6 100644 --- a/Dockerfiles/base/Dockerfile-7.1 +++ b/Dockerfiles/base/Dockerfile-7.1 @@ -59,7 +59,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-7.1.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-7.1.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-7.1.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d diff --git a/Dockerfiles/base/Dockerfile-7.2 b/Dockerfiles/base/Dockerfile-7.2 index d8df1b9..373dc28 100644 --- a/Dockerfiles/base/Dockerfile-7.2 +++ b/Dockerfiles/base/Dockerfile-7.2 @@ -59,7 +59,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-7.2.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-7.2.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-7.2.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d diff --git a/Dockerfiles/base/Dockerfile-7.3 b/Dockerfiles/base/Dockerfile-7.3 index 361644b..732ef3d 100644 --- a/Dockerfiles/base/Dockerfile-7.3 +++ b/Dockerfiles/base/Dockerfile-7.3 @@ -59,7 +59,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-7.3.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-7.3.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-7.3.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.2.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.2.conf index 100d142..b84509e 100644 --- a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.2.conf +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.2.conf @@ -40,7 +40,7 @@ Set listen(2) backlog - 1023 + 1024 Set permissions for unix socket, if one used. In Linux read/write permissions must be set in order to allow connections from web server. Many BSD-derrived systems allow connections regardless of permissions. @@ -50,16 +50,6 @@ Additional php.ini defines, specific to this pool of workers. - - E_ALL - Off - On - Off - Off - On - On - Off - Unix user of processes devilbox @@ -84,15 +74,15 @@ Sets the number of server processes created on startup. Used only when 'apache-like' pm_style is selected - 10 + 4 Sets the desired minimum number of idle server processes. Used only when 'apache-like' pm_style is selected - 5 + 2 Sets the desired maximum number of idle server processes. Used only when 'apache-like' pm_style is selected - 15 + 6 @@ -100,7 +90,7 @@ The timeout (in seconds) for serving a single request after which the worker process will be terminated Should be used when 'max_execution_time' ini option does not stop script execution for some reason '0s' means 'off' - 180s + 120s The timeout (in seconds) for serving of single request after which a php backtrace will be dumped to slow.log file '0s' means 'off' diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.3.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.3.conf index 370fe70..3ddf1d8 100644 --- a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.3.conf +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.3.conf @@ -1,3 +1,119 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.4.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.4.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.4.conf +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.4.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.5.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.5.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.5.conf +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.5.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.6.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.6.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.6.conf +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.6.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.0.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.0.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.0.conf +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.0.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.1.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.1.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.1.conf +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.1.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.2.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.2.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.2.conf +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.2.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.3.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.3.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.3.conf +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-7.3.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.2.conf b/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.2.conf deleted file mode 100644 index 8b13789..0000000 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.2.conf +++ /dev/null @@ -1 +0,0 @@ - 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 deleted file mode 100644 index 3d947a9..0000000 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.3.conf +++ /dev/null @@ -1,85 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.4.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.5.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-5.6.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.0.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.1.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.2.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/base/data/php-fpm.d/php-fpm.d-7.3.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox diff --git a/Dockerfiles/base/data/php-ini.d/php-5.2.ini b/Dockerfiles/base/data/php-ini.d/php-5.2.ini index 80dce90..2f614cd 100644 --- a/Dockerfiles/base/data/php-ini.d/php-5.2.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.2.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php-ini.d/php-5.3.ini b/Dockerfiles/base/data/php-ini.d/php-5.3.ini index 1ad9bc6..966ee72 100644 --- a/Dockerfiles/base/data/php-ini.d/php-5.3.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.3.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php-ini.d/php-5.4.ini b/Dockerfiles/base/data/php-ini.d/php-5.4.ini index 936d1df..dfb4d3b 100644 --- a/Dockerfiles/base/data/php-ini.d/php-5.4.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.4.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php-ini.d/php-5.5.ini b/Dockerfiles/base/data/php-ini.d/php-5.5.ini index 6b9ef0e..3684504 100644 --- a/Dockerfiles/base/data/php-ini.d/php-5.5.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.5.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php-ini.d/php-5.6.ini b/Dockerfiles/base/data/php-ini.d/php-5.6.ini index ba2a39e..0784586 100644 --- a/Dockerfiles/base/data/php-ini.d/php-5.6.ini +++ b/Dockerfiles/base/data/php-ini.d/php-5.6.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php-ini.d/php-7.0.ini b/Dockerfiles/base/data/php-ini.d/php-7.0.ini index a5ae47a..29e7b10 100644 --- a/Dockerfiles/base/data/php-ini.d/php-7.0.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.0.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php-ini.d/php-7.1.ini b/Dockerfiles/base/data/php-ini.d/php-7.1.ini index 68e5832..8aea9f8 100644 --- a/Dockerfiles/base/data/php-ini.d/php-7.1.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.1.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php-ini.d/php-7.2.ini b/Dockerfiles/base/data/php-ini.d/php-7.2.ini index 1c41a92..0029179 100644 --- a/Dockerfiles/base/data/php-ini.d/php-7.2.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.2.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php-ini.d/php-7.3.ini b/Dockerfiles/base/data/php-ini.d/php-7.3.ini index db61d26..bac8bfe 100644 --- a/Dockerfiles/base/data/php-ini.d/php-7.3.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.3.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 500dd54..56b6502 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -268,7 +268,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-5.2.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-5.2.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-5.2.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 210dca5..2983b27 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -312,7 +312,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-5.3.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-5.3.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-5.3.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index b9fdc9b..004ca98 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -327,7 +327,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-5.4.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-5.4.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-5.4.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 2332ec9..e47eba3 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -336,7 +336,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-5.5.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-5.5.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-5.5.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index ba33538..4c7fdb9 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -336,7 +336,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-5.6.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-5.6.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-5.6.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 88e825b..611869a 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -336,7 +336,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-7.0.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-7.0.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-7.0.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 3914d4b..94d56a4 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -336,7 +336,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-7.1.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-7.1.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-7.1.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index e26e4ba..cedb7e2 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -336,7 +336,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-7.2.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-7.2.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-7.2.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 9713a1a..492c3b7 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -324,7 +324,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-7.3.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-7.3.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-7.3.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.2.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.2.conf index a4c282a..b84509e 100644 --- a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.2.conf +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.2.conf @@ -40,7 +40,7 @@ Set listen(2) backlog - 1023 + 1024 Set permissions for unix socket, if one used. In Linux read/write permissions must be set in order to allow connections from web server. Many BSD-derrived systems allow connections regardless of permissions. @@ -50,16 +50,6 @@ Additional php.ini defines, specific to this pool of workers. - - E_ALL - Off - On - On - On - On - On - On - Unix user of processes devilbox @@ -84,15 +74,15 @@ Sets the number of server processes created on startup. Used only when 'apache-like' pm_style is selected - 10 + 4 Sets the desired minimum number of idle server processes. Used only when 'apache-like' pm_style is selected - 5 + 2 Sets the desired maximum number of idle server processes. Used only when 'apache-like' pm_style is selected - 15 + 6 @@ -100,7 +90,7 @@ The timeout (in seconds) for serving a single request after which the worker process will be terminated Should be used when 'max_execution_time' ini option does not stop script execution for some reason '0s' means 'off' - 180s + 120s The timeout (in seconds) for serving of single request after which a php backtrace will be dumped to slow.log file '0s' means 'off' diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.3.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.3.conf index 370fe70..3ddf1d8 100644 --- a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.3.conf +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.3.conf @@ -1,3 +1,119 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.4.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.4.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.4.conf +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.4.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.5.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.5.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.5.conf +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.5.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.6.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.6.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.6.conf +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.6.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.0.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.0.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.0.conf +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.0.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.1.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.1.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.1.conf +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.1.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.2.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.2.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.2.conf +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.2.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.3.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.3.conf index 370fe70..1d63a44 100644 --- a/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.3.conf +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-7.3.conf @@ -1,3 +1,121 @@ +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = 120s + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = /proc/self/fd/2 +log_level = notice + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = ondemand + +; The maximum number of child processes to be created +pm.max_children = 50 + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +pm.min_spare_servers = 2 + +; The desired maximum number of idle server processes. +pm.max_spare_servers = 6 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = 500 + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = 10s + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +; Keep env variables set by docker +clear_env = no + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + + +; ############################################################ +; User and Group +; ############################################################ + +[www] +user = devilbox +group = devilbox + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = 9000 +listen.backlog = 1024 diff --git a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.2.conf b/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.2.conf deleted file mode 100644 index 8b13789..0000000 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.2.conf +++ /dev/null @@ -1 +0,0 @@ - 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 deleted file mode 100644 index 3d947a9..0000000 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.3.conf +++ /dev/null @@ -1,85 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.4.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.5.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-5.6.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.0.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.1.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.2.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox 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 deleted file mode 100644 index af26d25..0000000 --- a/Dockerfiles/work/data/php-fpm.d/php-fpm.d-7.3.conf +++ /dev/null @@ -1,87 +0,0 @@ -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -; Keep env variables set by docker -clear_env = no - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = 9000 -listen.backlog = 1023 - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = 180s - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = /proc/self/fd/2 -log_level = notice - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = /proc/self/fd/2 - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = dynamic - -; The maximum number of child processes to be created -pm.max_children = 50 - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = 10 - -; The desired minimum number of idle server processes. -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -pm.max_spare_servers = 15 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = 500 - - -; ############################################################ -; User and Group -; ############################################################ - -[www] -user = devilbox -group = devilbox diff --git a/Dockerfiles/work/data/php-ini.d/php-5.2.ini b/Dockerfiles/work/data/php-ini.d/php-5.2.ini index e58a751..3cb919a 100644 --- a/Dockerfiles/work/data/php-ini.d/php-5.2.ini +++ b/Dockerfiles/work/data/php-ini.d/php-5.2.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/work/data/php-ini.d/php-5.3.ini b/Dockerfiles/work/data/php-ini.d/php-5.3.ini index 42bf474..911194b 100644 --- a/Dockerfiles/work/data/php-ini.d/php-5.3.ini +++ b/Dockerfiles/work/data/php-ini.d/php-5.3.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/work/data/php-ini.d/php-5.4.ini b/Dockerfiles/work/data/php-ini.d/php-5.4.ini index 8024900..30c1a65 100644 --- a/Dockerfiles/work/data/php-ini.d/php-5.4.ini +++ b/Dockerfiles/work/data/php-ini.d/php-5.4.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/work/data/php-ini.d/php-5.5.ini b/Dockerfiles/work/data/php-ini.d/php-5.5.ini index d1e947c..08f7133 100644 --- a/Dockerfiles/work/data/php-ini.d/php-5.5.ini +++ b/Dockerfiles/work/data/php-ini.d/php-5.5.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/work/data/php-ini.d/php-5.6.ini b/Dockerfiles/work/data/php-ini.d/php-5.6.ini index 85867c7..ec0f14d 100644 --- a/Dockerfiles/work/data/php-ini.d/php-5.6.ini +++ b/Dockerfiles/work/data/php-ini.d/php-5.6.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/work/data/php-ini.d/php-7.0.ini b/Dockerfiles/work/data/php-ini.d/php-7.0.ini index bb0da45..0d048f8 100644 --- a/Dockerfiles/work/data/php-ini.d/php-7.0.ini +++ b/Dockerfiles/work/data/php-ini.d/php-7.0.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/work/data/php-ini.d/php-7.1.ini b/Dockerfiles/work/data/php-ini.d/php-7.1.ini index 89816be..e11e06a 100644 --- a/Dockerfiles/work/data/php-ini.d/php-7.1.ini +++ b/Dockerfiles/work/data/php-ini.d/php-7.1.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/work/data/php-ini.d/php-7.2.ini b/Dockerfiles/work/data/php-ini.d/php-7.2.ini index cd9da8d..d94ce6e 100644 --- a/Dockerfiles/work/data/php-ini.d/php-7.2.ini +++ b/Dockerfiles/work/data/php-ini.d/php-7.2.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/Dockerfiles/work/data/php-ini.d/php-7.3.ini b/Dockerfiles/work/data/php-ini.d/php-7.3.ini index 3888e66..ce0d34f 100644 --- a/Dockerfiles/work/data/php-ini.d/php-7.3.ini +++ b/Dockerfiles/work/data/php-ini.d/php-7.3.ini @@ -14,14 +14,14 @@ memory_limit = 512M ; Timeouts -max_execution_time = 180 -max_input_time = 180 +max_execution_time = 120 +max_input_time = 120 ; Uploads ; Note: "post_max_size" should be greater than "upload_max_filesize" -post_max_size = 384M -upload_max_filesize = 256M +post_max_size = 72M +upload_max_filesize = 64M max_file_uploads = 20 diff --git a/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 b/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 index ffab174..7bacede 100644 --- a/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 +++ b/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 @@ -1,7 +1,129 @@ {% if not php_version == 5.2 %} +; ################################################################################ +; #### +; #### The following settings can be overwritten by later includes +; #### +; ################################################################################ + + +; ############################################################ +; Timeouts +; ############################################################ + +[www] +; The timeout for serving a single request after which the worker process will be killed. +; This option should be used when the 'max_execution_time' ini option does not stop script +; execution for some reason. +request_terminate_timeout = {{ item.cfg[item.key].request_terminate_timeout | default(item.cfg[item.alt].request_terminate_timeout) }} + + +; ############################################################ +; Logging +; ############################################################ + +[global] +error_log = {{ item.cfg[item.key].error_log | default(item.cfg[item.alt].error_log) }} +log_level = {{ item.cfg[item.key].log_level | default(item.cfg[item.alt].log_level) }} + +[www] +; if we send this to /proc/self/fd/1, it never appears +access.log = {{ item.cfg[item.key].access_log | default(item.cfg[item.alt].access_log) }} + + +; ############################################################ +; Worker configuration +; ############################################################ + +[www] + +; static - the number of child processes is fixed (pm.max_children). +; +; dynamic - the number of child processes is set dynamically based on the following directives: +; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. +; +; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where +; pm.start_servers are started when the service is started. +pm = {{ item.cfg[item.key].pm | default(item.cfg[item.alt].pm) }} + +; The maximum number of child processes to be created +pm.max_children = {{ item.cfg[item.key].pm_max_children | default(item.cfg[item.alt].pm_max_children) }} + +; The number of child processes created on startup. Used only when pm is set to dynamic. +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. +pm.start_servers = {{ item.cfg[item.key].pm_start_servers | default(item.cfg[item.alt].pm_start_servers) }} + +; The desired minimum number of idle server processes. +pm.min_spare_servers = {{ item.cfg[item.key].pm_min_spare_servers | default(item.cfg[item.alt].pm_min_spare_servers) }} + +; The desired maximum number of idle server processes. +pm.max_spare_servers = {{ item.cfg[item.key].pm_max_spare_servers | default(item.cfg[item.alt].pm_max_spare_servers) }} + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. +; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default value: 0. +pm.max_requests = {{ item.cfg[item.key].pm_max_requests | default(item.cfg[item.alt].pm_max_requests) }} + +; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand +pm.process_idle_timeout = {{ item.cfg[item.key].pm_process_idle_timeout | default(item.cfg[item.alt].pm_process_idle_timeout) }} + + +; ############################################################ +; Include +; ############################################################ + + +[global] +include = /usr/local/etc/php-fpm.d/*.conf + + +; ################################################################################ +; #### +; #### The following settings overwrite any includes again +; #### +; ################################################################################ + + +; ############################################################ +; Required for Dockerization +; ############################################################ + [global] daemonize = no -include = /usr/local/etc/php-fpm.d/*.conf + +[www] +{# This value is available since PHP >=5.4 #} +{% if not php_version == 5.3 %} +; Keep env variables set by docker +clear_env = {{ item.cfg[item.key].clear_env | default(item.cfg[item.alt].clear_env) }} +{% endif %} + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = {{ item.cfg[item.key].catch_workers_output | default(item.cfg[item.alt].catch_workers_output) }} + + +; ############################################################ +; User and Group +; ############################################################ + +[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) }} + + +; ############################################################ +; Networking +; ############################################################ + +[www] +; Ensure to listen here +listen = {{ item.cfg[item.key].listen | default(item.cfg[item.alt].listen)}} +{# Available since PHP >= 5.4 #} +listen.backlog = {{ item.cfg[item.key].listen_backlog | default(item.cfg[item.alt].listen_backlog) }} {% else %} {# PHP-FPM 5.2 uses XML format for configuration #} @@ -56,16 +178,6 @@ include = /usr/local/etc/php-fpm.d/*.conf Additional php.ini defines, specific to this pool of workers. - - E_ALL - {{ item.cfg[item.key].xmlrpc_errors | default(item.cfg[item.alt].xmlrpc_errors) }} - {{ item.cfg[item.key].report_memleaks | default(item.cfg[item.alt].report_memleaks) }} - {{ item.cfg[item.key].display_errors | default(item.cfg[item.alt].display_errors) }} - {{ item.cfg[item.key].display_startup_errors | default(item.cfg[item.alt].display_startup_errors) }} - {{ item.cfg[item.key].track_errors | default(item.cfg[item.alt].track_errors) }} - {{ item.cfg[item.key].log_errors | default(item.cfg[item.alt].log_errors) }} - {{ item.cfg[item.key].html_errors | default(item.cfg[item.alt].html_errors) }} - Unix user of processes {{ item.cfg[item.key].user | default(item.cfg[item.alt].user) }} diff --git a/build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 b/build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 deleted file mode 100644 index c186312..0000000 --- a/build/ansible/CONFIGURATIONS/php-fpm.d-conf.j2 +++ /dev/null @@ -1,94 +0,0 @@ -{# PHP-FPM 5.2 uses XML format for configuration and does not allow multiple files #} -{% if not php_version == 5.2 %} -[www] - -; ############################################################ -; Required for Dockerization -; ############################################################ - -{# This value is available since PHP >=5.4 #} -{% if not php_version == 5.3 %} -; Keep env variables set by docker -clear_env = {{ item.cfg[item.key].clear_env | default(item.cfg[item.alt].clear_env) }} -{% endif %} - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = {{ item.cfg[item.key].catch_workers_output | default(item.cfg[item.alt].catch_workers_output) }} - - -; ############################################################ -; Networking -; ############################################################ - -[www] -; Ensure to listen here -listen = {{ item.cfg[item.key].listen | default(item.cfg[item.alt].listen)}} -{# Available since PHP >= 5.4 #} -listen.backlog = {{ item.cfg[item.key].listen_backlog | default(item.cfg[item.alt].listen_backlog) }} - - -; ############################################################ -; Timeouts -; ############################################################ - -[www] -; The timeout for serving a single request after which the worker process will be killed. -; This option should be used when the 'max_execution_time' ini option does not stop script -; execution for some reason. -request_terminate_timeout = {{ item.cfg[item.key].request_terminate_timeout | default(item.cfg[item.alt].request_terminate_timeout) }} - - -; ############################################################ -; Logging -; ############################################################ - -[global] -error_log = {{ item.cfg[item.key].error_log | default(item.cfg[item.alt].error_log) }} -log_level = {{ item.cfg[item.key].log_level | default(item.cfg[item.alt].log_level) }} - -[www] -; if we send this to /proc/self/fd/1, it never appears -access.log = {{ item.cfg[item.key].access_log | default(item.cfg[item.alt].access_log) }} - - -; ############################################################ -; Worker configuration -; ############################################################ - -[www] -; The number of child processes is set dynamically based on the following directives: -; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers. -pm = {{ item.cfg[item.key].pm | default(item.cfg[item.alt].pm) }} - -; The maximum number of child processes to be created -pm.max_children = {{ item.cfg[item.key].pm_max_children | default(item.cfg[item.alt].pm_max_children) }} - -; The number of child processes created on startup. Used only when pm is set to dynamic. -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2. -pm.start_servers = {{ item.cfg[item.key].pm_start_servers | default(item.cfg[item.alt].pm_start_servers) }} - -; The desired minimum number of idle server processes. -pm.min_spare_servers = {{ item.cfg[item.key].pm_min_spare_servers | default(item.cfg[item.alt].pm_min_spare_servers) }} - -; The desired maximum number of idle server processes. -pm.max_spare_servers = {{ item.cfg[item.key].pm_max_spare_servers | default(item.cfg[item.alt].pm_max_spare_servers) }} - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. -; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default value: 0. -pm.max_requests = {{ item.cfg[item.key].pm_max_requests | default(item.cfg[item.alt].pm_max_requests) }} - - -; ############################################################ -; User and Group -; ############################################################ - -[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) }} -{% endif %} diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 index 58d35d9..be1ec42 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-base.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2 @@ -67,7 +67,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-{{ php_version }}.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-{{ php_version }}.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-{{ php_version }}.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d /docker-entrypoint.d diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 2207b35..fc47940 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -193,7 +193,6 @@ RUN set -x \ ### COPY ./data/php-ini.d/php-{{ php_version }}.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini COPY ./data/php-fpm.conf/php-fpm-{{ php_version }}.conf /usr/local/etc/php-fpm.conf -COPY ./data/php-fpm.d/php-fpm.d-{{ php_version }}.conf /usr/local/etc/php-fpm.d/php-fpm.d.conf COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 3e73eb7..493e4c2 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -23,34 +23,7 @@ php_all_versions: ### ### PHP settings equal for php.ini and php-fpm.comf (used below) ### -php_settings_all: - # ---- Settings for PHP.INI and PHP-FPM.CONF ---- - base: - # Timeouts - timeout: 180 - # Error reporting - error_reporting: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED - xmlrpc_errors: 'Off' - report_memleaks: 'On' - display_errors: 'Off' - display_startup_errors: 'Off' - track_errors: 'On' - log_errors: 'On' - html_errors: 'Off' - - work: - # Timeouts - timeout: 180 - # Error reporting - error_reporting: E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED - xmlrpc_errors: 'Off' - report_memleaks: 'On' - display_errors: 'On' - display_startup_errors: 'On' - track_errors: 'On' - log_errors: 'On' - html_errors: 'On' - +php_timeout: 120 ### ### PHP.ini @@ -61,25 +34,26 @@ php_settings_ini: # Memory memory_limit: 512M # Timeouts - max_execution_time: "{{ php_settings_all.base.timeout }}" - max_input_time: "{{ php_settings_all.base.timeout }}" + max_execution_time: "{{ php_timeout }}" + max_input_time: "{{ php_timeout }}" # Uploads - post_max_size: 384M - upload_max_filesize: 256M + # Note: "post_max_size" should be greater than "upload_max_filesize" + post_max_size: 72M + upload_max_filesize: 64M max_file_uploads: 20 # Variables variables_order: EGPCS max_input_vars: 8000 max_input_nesting_level: 64 # Error reporting - error_reporting: "{{ php_settings_all.base.error_reporting }}" - xmlrpc_errors: "{{ php_settings_all.base.xmlrpc_errors }}" - report_memleaks: "{{ php_settings_all.base.report_memleaks }}" - display_errors: "{{ php_settings_all.base.display_errors }}" - display_startup_errors: "{{ php_settings_all.base.display_startup_errors }}" - track_errors: "{{ php_settings_all.base.track_errors }}" - log_errors: "{{ php_settings_all.base.log_errors }}" - html_errors: "{{ php_settings_all.base.html_errors }}" + error_reporting: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED + xmlrpc_errors: 'Off' + report_memleaks: 'On' + display_errors: 'Off' + display_startup_errors: 'Off' + track_errors: 'On' + log_errors: 'On' + html_errors: 'Off' # Xdebug settings xdebug_default_enable: 'Off' xdebug_profiler_enable: 'Off' @@ -93,14 +67,14 @@ php_settings_ini: # ---- Inherits from base and overwrites certain values ---- work: # Error reporting - error_reporting: "{{ php_settings_all.work.error_reporting }}" - xmlrpc_errors: "{{ php_settings_all.work.xmlrpc_errors }}" - report_memleaks: "{{ php_settings_all.work.report_memleaks }}" - display_errors: "{{ php_settings_all.work.display_errors }}" - display_startup_errors: "{{ php_settings_all.work.display_startup_errors }}" - track_errors: "{{ php_settings_all.work.track_errors }}" - log_errors: "{{ php_settings_all.work.log_errors }}" - html_errors: "{{ php_settings_all.work.html_errors }}" + error_reporting: E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED + xmlrpc_errors: 'Off' + report_memleaks: 'On' + display_errors: 'On' + display_startup_errors: 'On' + track_errors: 'On' + log_errors: 'On' + html_errors: 'On' # Xdebug settings xdebug_default_enable: 'Off' xdebug_profiler_enable: 'Off' @@ -118,48 +92,32 @@ php_settings_fpm: clear_env: 'no' catch_workers_output: 'yes' # Timeouts - request_terminate_timeout: "{{ php_settings_all.work.timeout }}s" + request_terminate_timeout: "{{ php_timeout }}s" # Network listen: 9000 - listen_backlog: 1023 + listen_backlog: 1024 # Logging log_level: notice error_log: /proc/self/fd/2 access_log: /proc/self/fd/2 # Worker - pm: dynamic - pm_max_children: 50 - pm_start_servers: 10 - pm_min_spare_servers: 5 - pm_max_spare_servers: 15 - pm_max_requests: 500 + pm: ondemand + pm_max_children: 50 # pm: dynamic, ondemand or static + pm_start_servers: 4 # only for pm: dynamic (min_spare + (max_spare-min_spare)/2 + pm_min_spare_servers: 2 # only for pm: dynamic + pm_max_spare_servers: 6 # only for pm: dynamic + pm_max_requests: 500 # pm: dynamic or ondemand + pm_process_idle_timeout: 10s # only for pm: ondemand + # User/Group user: devilbox group: devilbox - # Error reporting - error_reporting: "{{ php_settings_all.base.error_reporting }}" - xmlrpc_errors: "{{ php_settings_all.base.xmlrpc_errors }}" - report_memleaks: "{{ php_settings_all.base.report_memleaks }}" - display_errors: "{{ php_settings_all.base.display_errors }}" - display_startup_errors: "{{ php_settings_all.base.display_startup_errors }}" - track_errors: "{{ php_settings_all.base.track_errors }}" - log_errors: "{{ php_settings_all.base.log_errors }}" - html_errors: "{{ php_settings_all.base.html_errors }}" # ---- Inherits from base ---- mods: # ---- Inherits from base ---- prod: # ---- Inherits from base and overwrites certain values ---- work: - # Error reporting - error_reporting: "{{ php_settings_all.work.error_reporting }}" - xmlrpc_errors: "{{ php_settings_all.work.xmlrpc_errors }}" - report_memleaks: "{{ php_settings_all.work.report_memleaks }}" - display_errors: "{{ php_settings_all.work.display_errors }}" - display_startup_errors: "{{ php_settings_all.work.display_startup_errors }}" - track_errors: "{{ php_settings_all.work.track_errors }}" - log_errors: "{{ php_settings_all.work.log_errors }}" - html_errors: "{{ php_settings_all.work.html_errors }}" ### @@ -190,7 +148,6 @@ template_configurations: cfg: "{{ php_settings_ini }}" key: work alt: base # Alternative key to use when definition is not set in 'work' - # php-fpm.conf - src: CONFIGURATIONS/php-fpm.conf.j2 dst: "../../Dockerfiles/base/data/php-fpm.conf/php-fpm-{{ php_version }}.conf" @@ -203,18 +160,6 @@ template_configurations: key: work alt: base - # php-fpm.d-conf - - src: CONFIGURATIONS/php-fpm.d-conf.j2 - dst: "../../Dockerfiles/base/data/php-fpm.d/php-fpm.d-{{ php_version }}.conf" - cfg: "{{ php_settings_fpm }}" - key: base - alt: base - - src: CONFIGURATIONS/php-fpm.d-conf.j2 - dst: "../../Dockerfiles/work/data/php-fpm.d/php-fpm.d-{{ php_version }}.conf" - cfg: "{{ php_settings_fpm }}" - key: work - alt: base - ### ### Variables to be used in this file (group_vars/all.yml)