Browse Source

Revert "Php pools (#4423)" (#4427)

This reverts commit e22ac248503a0de1a281684c1a11c5490dc19b89.
Nate 6 years ago
parent
commit
a99e1113ef

+ 7 - 44
frameworks/PHP/php/deploy/conf/php-fpm-pools.conf

@@ -68,7 +68,7 @@ error_log = /dev/stderr
 ; Use it with caution.
 ; Note: A value of 0 indicates no limit
 ; Default Value: 0
- process.max = 0
+; process.max = 128
 
 ; Specify the nice(2) priority to apply to the master process (only if set)
 ; The value can vary from -19 (highest priority) to 20 (lowest priority)
@@ -84,12 +84,12 @@ error_log = /dev/stderr
 
 ; Set open file descriptor rlimit for the master process.
 ; Default Value: system defined value
-rlimit_files = 2000000
+;rlimit_files = 1024
 
 ; Set max core size rlimit for the master process.
 ; Possible Values: 'unlimited' or an integer greater or equal to 0
 ; Default Value: system defined value
-rlimit_core = unlimited
+;rlimit_core = 0
 
 ; Specify the event mechanism FPM will use. The following is available:
 ; - select     (any POSIX os)
@@ -165,7 +165,7 @@ listen = /run/php/php7.3-fpm.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
-;listen.backlog = 65535
+listen.backlog = 65535
 
 ; Set permissions for unix socket, if one is used. In Linux, read/write
 ; permissions must be set in order to allow connections from a web server. Many
@@ -238,7 +238,7 @@ pm = static
 ; forget to tweak pm.* to fit your needs.
 ; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
 ; Note: This value is mandatory.
-pm.max_children = 256
+pm.max_children = 512
 
 ; The number of child processes created on startup.
 ; Note: Used only when pm is set to 'dynamic'
@@ -560,48 +560,11 @@ listen = /run/php/php7.3-fpm-2.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
-;listen.backlog = 65535
-
-listen.owner = www-data
-listen.group = www-data
-;listen.mode = 0660
-
-pm = static
-pm.max_children = 256
-
-[www3]
-
-user = www-data
-group = www-data
-
-listen = /run/php/php7.3-fpm-3.sock
-
-; Set listen(2) backlog.
-; Default Value: 511 (-1 on FreeBSD and OpenBSD)
-;listen.backlog = 65535
-
-listen.owner = www-data
-listen.group = www-data
-;listen.mode = 0660
-
-pm = static
-pm.max_children = 256
-
-
-[www4]
-
-user = www-data
-group = www-data
-
-listen = /run/php/php7.3-fpm-4.sock
-
-; Set listen(2) backlog.
-; Default Value: 511 (-1 on FreeBSD and OpenBSD)
-;listen.backlog = 65535
+listen.backlog = 65535
 
 listen.owner = www-data
 listen.group = www-data
 ;listen.mode = 0660
 
 pm = static
-pm.max_children = 256
+pm.max_children = 512

+ 0 - 2
frameworks/PHP/php/deploy/nginx-pools.conf

@@ -41,8 +41,6 @@ http {
     upstream fastcgi_backend {
         server unix:/var/run/php/php7.3-fpm.sock;
         server unix:/var/run/php/php7.3-fpm-2.sock;
-        server unix:/var/run/php/php7.3-fpm-3.sock;
-        server unix:/var/run/php/php7.3-fpm-4.sock;
         keepalive 40;
     }
 

+ 1 - 1
frameworks/PHP/php/php-pools.dockerfile

@@ -13,7 +13,7 @@ ADD ./ /php
 WORKDIR /php
 
 COPY deploy/conf/php-fpm-pools.conf /etc/php/7.3/fpm/php-fpm.conf
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 256|pm.max_children = 128|g" /etc/php/7.3/fpm/php-fpm.conf ; fi;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 512|pm.max_children = 256|g" /etc/php/7.3/fpm/php-fpm.conf ; fi;
 
 RUN chmod -R 777 /php