From 6bcebeaba503855639a8638a48fbbdf90ec7cf7f Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 29 Dec 2017 01:41:43 +0200 Subject: [PATCH] ondemand instead of dynamic php-fpm --- install/debian/7/php5-fpm/www.conf | 11 ++++---- .../7/templates/web/php5-fpm/default.tpl | 10 ++++---- .../7/templates/web/php5-fpm/no-php.tpl | 25 ++++++++++++------- .../7/templates/web/php5-fpm/socket.tpl | 23 +++++++++-------- install/debian/8/php5-fpm/www.conf | 11 ++++---- .../8/templates/web/php5-fpm/default.tpl | 10 ++++---- .../8/templates/web/php5-fpm/no-php.tpl | 25 ++++++++++++------- .../8/templates/web/php5-fpm/socket.tpl | 23 +++++++++-------- install/rhel/5/php-fpm/www.conf | 10 ++++---- .../rhel/5/templates/web/php-fpm/default.tpl | 19 ++++++++------ .../rhel/5/templates/web/php-fpm/socket.tpl | 25 +++++++++++-------- install/rhel/6/php-fpm/www.conf | 10 ++++---- .../rhel/6/templates/web/php-fpm/default.tpl | 10 ++++---- .../rhel/6/templates/web/php-fpm/socket.tpl | 25 +++++++++++-------- install/rhel/7/php-fpm/www.conf | 10 ++++---- .../rhel/7/templates/web/php-fpm/default.tpl | 10 ++++---- .../rhel/7/templates/web/php-fpm/socket.tpl | 25 +++++++++++-------- install/ubuntu/12.04/php-fpm/www.conf | 11 ++++---- .../12.04/templates/web/php-fpm/default.tpl | 10 ++++---- .../12.04/templates/web/php-fpm/no-php.tpl | 25 ++++++++++++------- .../12.04/templates/web/php-fpm/socket.tpl | 23 +++++++++-------- install/ubuntu/12.10/php-fpm/www.conf | 11 ++++---- .../12.10/templates/web/php-fpm/default.tpl | 10 ++++---- .../12.10/templates/web/php-fpm/no-php.tpl | 25 ++++++++++++------- .../12.10/templates/web/php-fpm/socket.tpl | 23 +++++++++-------- install/ubuntu/13.04/php-fpm/www.conf | 11 ++++---- .../13.04/templates/web/php-fpm/default.tpl | 10 ++++---- .../13.04/templates/web/php-fpm/no-php.tpl | 25 ++++++++++++------- .../13.04/templates/web/php-fpm/socket.tpl | 23 +++++++++-------- install/ubuntu/13.10/php-fpm/www.conf | 11 ++++---- .../13.10/templates/web/php-fpm/default.tpl | 10 ++++---- .../13.10/templates/web/php-fpm/no-php.tpl | 25 ++++++++++++------- .../13.10/templates/web/php-fpm/socket.tpl | 23 +++++++++-------- install/ubuntu/14.04/php-fpm/www.conf | 11 ++++---- .../14.04/templates/web/php-fpm/default.tpl | 10 ++++---- .../14.04/templates/web/php-fpm/no-php.tpl | 25 ++++++++++++------- .../14.04/templates/web/php-fpm/socket.tpl | 23 +++++++++-------- install/ubuntu/14.10/php-fpm/www.conf | 11 ++++---- .../14.10/templates/web/php-fpm/default.tpl | 10 ++++---- .../14.10/templates/web/php-fpm/no-php.tpl | 25 ++++++++++++------- .../14.10/templates/web/php-fpm/socket.tpl | 23 +++++++++-------- install/ubuntu/15.04/php-fpm/www.conf | 11 ++++---- .../15.04/templates/web/php-fpm/default.tpl | 10 ++++---- .../15.04/templates/web/php-fpm/no-php.tpl | 25 ++++++++++++------- .../15.04/templates/web/php-fpm/socket.tpl | 23 +++++++++-------- install/ubuntu/15.10/php-fpm/www.conf | 11 ++++---- .../15.10/templates/web/php-fpm/default.tpl | 10 ++++---- .../15.10/templates/web/php-fpm/no-php.tpl | 25 ++++++++++++------- .../15.10/templates/web/php-fpm/socket.tpl | 23 +++++++++-------- install/ubuntu/16.10/php-fpm/www.conf | 11 ++++---- .../16.10/templates/web/php-fpm/default.tpl | 10 ++++---- .../16.10/templates/web/php-fpm/no-php.tpl | 25 ++++++++++++------- .../16.10/templates/web/php-fpm/socket.tpl | 19 ++++++++------ 53 files changed, 516 insertions(+), 383 deletions(-) diff --git a/install/debian/7/php5-fpm/www.conf b/install/debian/7/php5-fpm/www.conf index d046bcee..3c87f33c 100644 --- a/install/debian/7/php5-fpm/www.conf +++ b/install/debian/7/php5-fpm/www.conf @@ -1,10 +1,11 @@ [www] listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 + user = www-data group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/debian/7/templates/web/php5-fpm/default.tpl b/install/debian/7/templates/web/php5-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/debian/7/templates/web/php5-fpm/default.tpl +++ b/install/debian/7/templates/web/php5-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/debian/7/templates/web/php5-fpm/no-php.tpl b/install/debian/7/templates/web/php5-fpm/no-php.tpl index e677f3e9..047c33ed 100644 --- a/install/debian/7/templates/web/php5-fpm/no-php.tpl +++ b/install/debian/7/templates/web/php5-fpm/no-php.tpl @@ -1,13 +1,20 @@ ;[%backend%] -;user = %user% -;group = %user% ;listen = /dev/null -;listen.owner = %user% -;listen.group = nginx +;user = %user% +;group = %user% -;pm = dynamic -;pm.max_children = 50 -;pm.start_servers = 3 -;pm.min_spare_servers = 2 -;pm.max_spare_servers = 10 +;listen.owner = %user% +;listen.group = www-data + +;pm = ondemand +;pm.max_children = 4 +;pm.max_requests = 4000 +;pm.process_idle_timeout = 10s +;pm.status_path = /status + +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /home/%user%/tmp +;env[TMPDIR] = /home/%user%/tmp +;env[TEMP] = /home/%user%/tmp diff --git a/install/debian/7/templates/web/php5-fpm/socket.tpl b/install/debian/7/templates/web/php5-fpm/socket.tpl index 22cf6d8e..a0151084 100644 --- a/install/debian/7/templates/web/php5-fpm/socket.tpl +++ b/install/debian/7/templates/web/php5-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php/%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data +listen.owner = %user% listen.group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/debian/8/php5-fpm/www.conf b/install/debian/8/php5-fpm/www.conf index d046bcee..3c87f33c 100644 --- a/install/debian/8/php5-fpm/www.conf +++ b/install/debian/8/php5-fpm/www.conf @@ -1,10 +1,11 @@ [www] listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 + user = www-data group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/debian/8/templates/web/php5-fpm/default.tpl b/install/debian/8/templates/web/php5-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/debian/8/templates/web/php5-fpm/default.tpl +++ b/install/debian/8/templates/web/php5-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/debian/8/templates/web/php5-fpm/no-php.tpl b/install/debian/8/templates/web/php5-fpm/no-php.tpl index e677f3e9..047c33ed 100644 --- a/install/debian/8/templates/web/php5-fpm/no-php.tpl +++ b/install/debian/8/templates/web/php5-fpm/no-php.tpl @@ -1,13 +1,20 @@ ;[%backend%] -;user = %user% -;group = %user% ;listen = /dev/null -;listen.owner = %user% -;listen.group = nginx +;user = %user% +;group = %user% -;pm = dynamic -;pm.max_children = 50 -;pm.start_servers = 3 -;pm.min_spare_servers = 2 -;pm.max_spare_servers = 10 +;listen.owner = %user% +;listen.group = www-data + +;pm = ondemand +;pm.max_children = 4 +;pm.max_requests = 4000 +;pm.process_idle_timeout = 10s +;pm.status_path = /status + +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /home/%user%/tmp +;env[TMPDIR] = /home/%user%/tmp +;env[TEMP] = /home/%user%/tmp diff --git a/install/debian/8/templates/web/php5-fpm/socket.tpl b/install/debian/8/templates/web/php5-fpm/socket.tpl index 22cf6d8e..a0151084 100644 --- a/install/debian/8/templates/web/php5-fpm/socket.tpl +++ b/install/debian/8/templates/web/php5-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php/%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data +listen.owner = %user% listen.group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/rhel/5/php-fpm/www.conf b/install/rhel/5/php-fpm/www.conf index 260109d8..1bc0b075 100644 --- a/install/rhel/5/php-fpm/www.conf +++ b/install/rhel/5/php-fpm/www.conf @@ -3,8 +3,8 @@ listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 user = apache group = apache -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/rhel/5/templates/web/php-fpm/default.tpl b/install/rhel/5/templates/web/php-fpm/default.tpl index 44ccf7a4..209e1e43 100644 --- a/install/rhel/5/templates/web/php-fpm/default.tpl +++ b/install/rhel/5/templates/web/php-fpm/default.tpl @@ -5,14 +5,17 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/rhel/5/templates/web/php-fpm/socket.tpl b/install/rhel/5/templates/web/php-fpm/socket.tpl index 22cf6d8e..d05a29e4 100644 --- a/install/rhel/5/templates/web/php-fpm/socket.tpl +++ b/install/rhel/5/templates/web/php-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php-%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data -listen.group = www-data +listen.owner = %user% +listen.group = nginx -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/rhel/6/php-fpm/www.conf b/install/rhel/6/php-fpm/www.conf index 260109d8..1bc0b075 100644 --- a/install/rhel/6/php-fpm/www.conf +++ b/install/rhel/6/php-fpm/www.conf @@ -3,8 +3,8 @@ listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 user = apache group = apache -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/rhel/6/templates/web/php-fpm/default.tpl b/install/rhel/6/templates/web/php-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/rhel/6/templates/web/php-fpm/default.tpl +++ b/install/rhel/6/templates/web/php-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/rhel/6/templates/web/php-fpm/socket.tpl b/install/rhel/6/templates/web/php-fpm/socket.tpl index 22cf6d8e..d05a29e4 100644 --- a/install/rhel/6/templates/web/php-fpm/socket.tpl +++ b/install/rhel/6/templates/web/php-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php-%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data -listen.group = www-data +listen.owner = %user% +listen.group = nginx -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/rhel/7/php-fpm/www.conf b/install/rhel/7/php-fpm/www.conf index 260109d8..1bc0b075 100644 --- a/install/rhel/7/php-fpm/www.conf +++ b/install/rhel/7/php-fpm/www.conf @@ -3,8 +3,8 @@ listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 user = apache group = apache -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/rhel/7/templates/web/php-fpm/default.tpl b/install/rhel/7/templates/web/php-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/rhel/7/templates/web/php-fpm/default.tpl +++ b/install/rhel/7/templates/web/php-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/rhel/7/templates/web/php-fpm/socket.tpl b/install/rhel/7/templates/web/php-fpm/socket.tpl index 22cf6d8e..d05a29e4 100644 --- a/install/rhel/7/templates/web/php-fpm/socket.tpl +++ b/install/rhel/7/templates/web/php-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php-%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data -listen.group = www-data +listen.owner = %user% +listen.group = nginx -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/12.04/php-fpm/www.conf b/install/ubuntu/12.04/php-fpm/www.conf index d046bcee..3c87f33c 100644 --- a/install/ubuntu/12.04/php-fpm/www.conf +++ b/install/ubuntu/12.04/php-fpm/www.conf @@ -1,10 +1,11 @@ [www] listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 + user = www-data group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/ubuntu/12.04/templates/web/php-fpm/default.tpl b/install/ubuntu/12.04/templates/web/php-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/ubuntu/12.04/templates/web/php-fpm/default.tpl +++ b/install/ubuntu/12.04/templates/web/php-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/ubuntu/12.04/templates/web/php-fpm/no-php.tpl b/install/ubuntu/12.04/templates/web/php-fpm/no-php.tpl index e677f3e9..047c33ed 100644 --- a/install/ubuntu/12.04/templates/web/php-fpm/no-php.tpl +++ b/install/ubuntu/12.04/templates/web/php-fpm/no-php.tpl @@ -1,13 +1,20 @@ ;[%backend%] -;user = %user% -;group = %user% ;listen = /dev/null -;listen.owner = %user% -;listen.group = nginx +;user = %user% +;group = %user% -;pm = dynamic -;pm.max_children = 50 -;pm.start_servers = 3 -;pm.min_spare_servers = 2 -;pm.max_spare_servers = 10 +;listen.owner = %user% +;listen.group = www-data + +;pm = ondemand +;pm.max_children = 4 +;pm.max_requests = 4000 +;pm.process_idle_timeout = 10s +;pm.status_path = /status + +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /home/%user%/tmp +;env[TMPDIR] = /home/%user%/tmp +;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/12.04/templates/web/php-fpm/socket.tpl b/install/ubuntu/12.04/templates/web/php-fpm/socket.tpl index 22cf6d8e..a0151084 100644 --- a/install/ubuntu/12.04/templates/web/php-fpm/socket.tpl +++ b/install/ubuntu/12.04/templates/web/php-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php/%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data +listen.owner = %user% listen.group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/12.10/php-fpm/www.conf b/install/ubuntu/12.10/php-fpm/www.conf index d046bcee..3c87f33c 100644 --- a/install/ubuntu/12.10/php-fpm/www.conf +++ b/install/ubuntu/12.10/php-fpm/www.conf @@ -1,10 +1,11 @@ [www] listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 + user = www-data group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/ubuntu/12.10/templates/web/php-fpm/default.tpl b/install/ubuntu/12.10/templates/web/php-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/ubuntu/12.10/templates/web/php-fpm/default.tpl +++ b/install/ubuntu/12.10/templates/web/php-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/ubuntu/12.10/templates/web/php-fpm/no-php.tpl b/install/ubuntu/12.10/templates/web/php-fpm/no-php.tpl index e677f3e9..047c33ed 100644 --- a/install/ubuntu/12.10/templates/web/php-fpm/no-php.tpl +++ b/install/ubuntu/12.10/templates/web/php-fpm/no-php.tpl @@ -1,13 +1,20 @@ ;[%backend%] -;user = %user% -;group = %user% ;listen = /dev/null -;listen.owner = %user% -;listen.group = nginx +;user = %user% +;group = %user% -;pm = dynamic -;pm.max_children = 50 -;pm.start_servers = 3 -;pm.min_spare_servers = 2 -;pm.max_spare_servers = 10 +;listen.owner = %user% +;listen.group = www-data + +;pm = ondemand +;pm.max_children = 4 +;pm.max_requests = 4000 +;pm.process_idle_timeout = 10s +;pm.status_path = /status + +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /home/%user%/tmp +;env[TMPDIR] = /home/%user%/tmp +;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/12.10/templates/web/php-fpm/socket.tpl b/install/ubuntu/12.10/templates/web/php-fpm/socket.tpl index 22cf6d8e..a0151084 100644 --- a/install/ubuntu/12.10/templates/web/php-fpm/socket.tpl +++ b/install/ubuntu/12.10/templates/web/php-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php/%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data +listen.owner = %user% listen.group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/13.04/php-fpm/www.conf b/install/ubuntu/13.04/php-fpm/www.conf index d046bcee..3c87f33c 100644 --- a/install/ubuntu/13.04/php-fpm/www.conf +++ b/install/ubuntu/13.04/php-fpm/www.conf @@ -1,10 +1,11 @@ [www] listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 + user = www-data group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/ubuntu/13.04/templates/web/php-fpm/default.tpl b/install/ubuntu/13.04/templates/web/php-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/ubuntu/13.04/templates/web/php-fpm/default.tpl +++ b/install/ubuntu/13.04/templates/web/php-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/ubuntu/13.04/templates/web/php-fpm/no-php.tpl b/install/ubuntu/13.04/templates/web/php-fpm/no-php.tpl index e677f3e9..047c33ed 100644 --- a/install/ubuntu/13.04/templates/web/php-fpm/no-php.tpl +++ b/install/ubuntu/13.04/templates/web/php-fpm/no-php.tpl @@ -1,13 +1,20 @@ ;[%backend%] -;user = %user% -;group = %user% ;listen = /dev/null -;listen.owner = %user% -;listen.group = nginx +;user = %user% +;group = %user% -;pm = dynamic -;pm.max_children = 50 -;pm.start_servers = 3 -;pm.min_spare_servers = 2 -;pm.max_spare_servers = 10 +;listen.owner = %user% +;listen.group = www-data + +;pm = ondemand +;pm.max_children = 4 +;pm.max_requests = 4000 +;pm.process_idle_timeout = 10s +;pm.status_path = /status + +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /home/%user%/tmp +;env[TMPDIR] = /home/%user%/tmp +;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/13.04/templates/web/php-fpm/socket.tpl b/install/ubuntu/13.04/templates/web/php-fpm/socket.tpl index 22cf6d8e..a0151084 100644 --- a/install/ubuntu/13.04/templates/web/php-fpm/socket.tpl +++ b/install/ubuntu/13.04/templates/web/php-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php/%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data +listen.owner = %user% listen.group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/13.10/php-fpm/www.conf b/install/ubuntu/13.10/php-fpm/www.conf index d046bcee..3c87f33c 100644 --- a/install/ubuntu/13.10/php-fpm/www.conf +++ b/install/ubuntu/13.10/php-fpm/www.conf @@ -1,10 +1,11 @@ [www] listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 + user = www-data group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/ubuntu/13.10/templates/web/php-fpm/default.tpl b/install/ubuntu/13.10/templates/web/php-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/ubuntu/13.10/templates/web/php-fpm/default.tpl +++ b/install/ubuntu/13.10/templates/web/php-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/ubuntu/13.10/templates/web/php-fpm/no-php.tpl b/install/ubuntu/13.10/templates/web/php-fpm/no-php.tpl index e677f3e9..047c33ed 100644 --- a/install/ubuntu/13.10/templates/web/php-fpm/no-php.tpl +++ b/install/ubuntu/13.10/templates/web/php-fpm/no-php.tpl @@ -1,13 +1,20 @@ ;[%backend%] -;user = %user% -;group = %user% ;listen = /dev/null -;listen.owner = %user% -;listen.group = nginx +;user = %user% +;group = %user% -;pm = dynamic -;pm.max_children = 50 -;pm.start_servers = 3 -;pm.min_spare_servers = 2 -;pm.max_spare_servers = 10 +;listen.owner = %user% +;listen.group = www-data + +;pm = ondemand +;pm.max_children = 4 +;pm.max_requests = 4000 +;pm.process_idle_timeout = 10s +;pm.status_path = /status + +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /home/%user%/tmp +;env[TMPDIR] = /home/%user%/tmp +;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/13.10/templates/web/php-fpm/socket.tpl b/install/ubuntu/13.10/templates/web/php-fpm/socket.tpl index 22cf6d8e..a0151084 100644 --- a/install/ubuntu/13.10/templates/web/php-fpm/socket.tpl +++ b/install/ubuntu/13.10/templates/web/php-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php/%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data +listen.owner = %user% listen.group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/14.04/php-fpm/www.conf b/install/ubuntu/14.04/php-fpm/www.conf index d046bcee..3c87f33c 100644 --- a/install/ubuntu/14.04/php-fpm/www.conf +++ b/install/ubuntu/14.04/php-fpm/www.conf @@ -1,10 +1,11 @@ [www] listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 + user = www-data group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/ubuntu/14.04/templates/web/php-fpm/default.tpl b/install/ubuntu/14.04/templates/web/php-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/ubuntu/14.04/templates/web/php-fpm/default.tpl +++ b/install/ubuntu/14.04/templates/web/php-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/ubuntu/14.04/templates/web/php-fpm/no-php.tpl b/install/ubuntu/14.04/templates/web/php-fpm/no-php.tpl index e677f3e9..047c33ed 100644 --- a/install/ubuntu/14.04/templates/web/php-fpm/no-php.tpl +++ b/install/ubuntu/14.04/templates/web/php-fpm/no-php.tpl @@ -1,13 +1,20 @@ ;[%backend%] -;user = %user% -;group = %user% ;listen = /dev/null -;listen.owner = %user% -;listen.group = nginx +;user = %user% +;group = %user% -;pm = dynamic -;pm.max_children = 50 -;pm.start_servers = 3 -;pm.min_spare_servers = 2 -;pm.max_spare_servers = 10 +;listen.owner = %user% +;listen.group = www-data + +;pm = ondemand +;pm.max_children = 4 +;pm.max_requests = 4000 +;pm.process_idle_timeout = 10s +;pm.status_path = /status + +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /home/%user%/tmp +;env[TMPDIR] = /home/%user%/tmp +;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/14.04/templates/web/php-fpm/socket.tpl b/install/ubuntu/14.04/templates/web/php-fpm/socket.tpl index 22cf6d8e..a0151084 100644 --- a/install/ubuntu/14.04/templates/web/php-fpm/socket.tpl +++ b/install/ubuntu/14.04/templates/web/php-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php/%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data +listen.owner = %user% listen.group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/14.10/php-fpm/www.conf b/install/ubuntu/14.10/php-fpm/www.conf index d046bcee..3c87f33c 100644 --- a/install/ubuntu/14.10/php-fpm/www.conf +++ b/install/ubuntu/14.10/php-fpm/www.conf @@ -1,10 +1,11 @@ [www] listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 + user = www-data group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/ubuntu/14.10/templates/web/php-fpm/default.tpl b/install/ubuntu/14.10/templates/web/php-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/ubuntu/14.10/templates/web/php-fpm/default.tpl +++ b/install/ubuntu/14.10/templates/web/php-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/ubuntu/14.10/templates/web/php-fpm/no-php.tpl b/install/ubuntu/14.10/templates/web/php-fpm/no-php.tpl index e677f3e9..047c33ed 100644 --- a/install/ubuntu/14.10/templates/web/php-fpm/no-php.tpl +++ b/install/ubuntu/14.10/templates/web/php-fpm/no-php.tpl @@ -1,13 +1,20 @@ ;[%backend%] -;user = %user% -;group = %user% ;listen = /dev/null -;listen.owner = %user% -;listen.group = nginx +;user = %user% +;group = %user% -;pm = dynamic -;pm.max_children = 50 -;pm.start_servers = 3 -;pm.min_spare_servers = 2 -;pm.max_spare_servers = 10 +;listen.owner = %user% +;listen.group = www-data + +;pm = ondemand +;pm.max_children = 4 +;pm.max_requests = 4000 +;pm.process_idle_timeout = 10s +;pm.status_path = /status + +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /home/%user%/tmp +;env[TMPDIR] = /home/%user%/tmp +;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/14.10/templates/web/php-fpm/socket.tpl b/install/ubuntu/14.10/templates/web/php-fpm/socket.tpl index 22cf6d8e..a0151084 100644 --- a/install/ubuntu/14.10/templates/web/php-fpm/socket.tpl +++ b/install/ubuntu/14.10/templates/web/php-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php/%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data +listen.owner = %user% listen.group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/15.04/php-fpm/www.conf b/install/ubuntu/15.04/php-fpm/www.conf index d046bcee..3c87f33c 100644 --- a/install/ubuntu/15.04/php-fpm/www.conf +++ b/install/ubuntu/15.04/php-fpm/www.conf @@ -1,10 +1,11 @@ [www] listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 + user = www-data group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/ubuntu/15.04/templates/web/php-fpm/default.tpl b/install/ubuntu/15.04/templates/web/php-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/ubuntu/15.04/templates/web/php-fpm/default.tpl +++ b/install/ubuntu/15.04/templates/web/php-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/ubuntu/15.04/templates/web/php-fpm/no-php.tpl b/install/ubuntu/15.04/templates/web/php-fpm/no-php.tpl index e677f3e9..047c33ed 100644 --- a/install/ubuntu/15.04/templates/web/php-fpm/no-php.tpl +++ b/install/ubuntu/15.04/templates/web/php-fpm/no-php.tpl @@ -1,13 +1,20 @@ ;[%backend%] -;user = %user% -;group = %user% ;listen = /dev/null -;listen.owner = %user% -;listen.group = nginx +;user = %user% +;group = %user% -;pm = dynamic -;pm.max_children = 50 -;pm.start_servers = 3 -;pm.min_spare_servers = 2 -;pm.max_spare_servers = 10 +;listen.owner = %user% +;listen.group = www-data + +;pm = ondemand +;pm.max_children = 4 +;pm.max_requests = 4000 +;pm.process_idle_timeout = 10s +;pm.status_path = /status + +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /home/%user%/tmp +;env[TMPDIR] = /home/%user%/tmp +;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/15.04/templates/web/php-fpm/socket.tpl b/install/ubuntu/15.04/templates/web/php-fpm/socket.tpl index 22cf6d8e..a0151084 100644 --- a/install/ubuntu/15.04/templates/web/php-fpm/socket.tpl +++ b/install/ubuntu/15.04/templates/web/php-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php/%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data +listen.owner = %user% listen.group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/15.10/php-fpm/www.conf b/install/ubuntu/15.10/php-fpm/www.conf index d046bcee..3c87f33c 100644 --- a/install/ubuntu/15.10/php-fpm/www.conf +++ b/install/ubuntu/15.10/php-fpm/www.conf @@ -1,10 +1,11 @@ [www] listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 + user = www-data group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/ubuntu/15.10/templates/web/php-fpm/default.tpl b/install/ubuntu/15.10/templates/web/php-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/ubuntu/15.10/templates/web/php-fpm/default.tpl +++ b/install/ubuntu/15.10/templates/web/php-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/ubuntu/15.10/templates/web/php-fpm/no-php.tpl b/install/ubuntu/15.10/templates/web/php-fpm/no-php.tpl index e677f3e9..047c33ed 100644 --- a/install/ubuntu/15.10/templates/web/php-fpm/no-php.tpl +++ b/install/ubuntu/15.10/templates/web/php-fpm/no-php.tpl @@ -1,13 +1,20 @@ ;[%backend%] -;user = %user% -;group = %user% ;listen = /dev/null -;listen.owner = %user% -;listen.group = nginx +;user = %user% +;group = %user% -;pm = dynamic -;pm.max_children = 50 -;pm.start_servers = 3 -;pm.min_spare_servers = 2 -;pm.max_spare_servers = 10 +;listen.owner = %user% +;listen.group = www-data + +;pm = ondemand +;pm.max_children = 4 +;pm.max_requests = 4000 +;pm.process_idle_timeout = 10s +;pm.status_path = /status + +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /home/%user%/tmp +;env[TMPDIR] = /home/%user%/tmp +;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/15.10/templates/web/php-fpm/socket.tpl b/install/ubuntu/15.10/templates/web/php-fpm/socket.tpl index 22cf6d8e..a0151084 100644 --- a/install/ubuntu/15.10/templates/web/php-fpm/socket.tpl +++ b/install/ubuntu/15.10/templates/web/php-fpm/socket.tpl @@ -1,21 +1,24 @@ [%backend%] -listen = /var/run/php5-%backend%.sock +listen = /var/run/php/%backend%.sock listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -listen.owner = www-data +listen.owner = %user% listen.group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/16.10/php-fpm/www.conf b/install/ubuntu/16.10/php-fpm/www.conf index d046bcee..3c87f33c 100644 --- a/install/ubuntu/16.10/php-fpm/www.conf +++ b/install/ubuntu/16.10/php-fpm/www.conf @@ -1,10 +1,11 @@ [www] listen = 127.0.0.1:9000 listen.allowed_clients = 127.0.0.1 + user = www-data group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 35 + +pm = ondemand +pm.max_children = 2 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s diff --git a/install/ubuntu/16.10/templates/web/php-fpm/default.tpl b/install/ubuntu/16.10/templates/web/php-fpm/default.tpl index 43909daa..209e1e43 100644 --- a/install/ubuntu/16.10/templates/web/php-fpm/default.tpl +++ b/install/ubuntu/16.10/templates/web/php-fpm/default.tpl @@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1 user = %user% group = %user% -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status php_admin_value[upload_tmp_dir] = /home/%user%/tmp php_admin_value[session.save_path] = /home/%user%/tmp diff --git a/install/ubuntu/16.10/templates/web/php-fpm/no-php.tpl b/install/ubuntu/16.10/templates/web/php-fpm/no-php.tpl index e677f3e9..047c33ed 100644 --- a/install/ubuntu/16.10/templates/web/php-fpm/no-php.tpl +++ b/install/ubuntu/16.10/templates/web/php-fpm/no-php.tpl @@ -1,13 +1,20 @@ ;[%backend%] -;user = %user% -;group = %user% ;listen = /dev/null -;listen.owner = %user% -;listen.group = nginx +;user = %user% +;group = %user% -;pm = dynamic -;pm.max_children = 50 -;pm.start_servers = 3 -;pm.min_spare_servers = 2 -;pm.max_spare_servers = 10 +;listen.owner = %user% +;listen.group = www-data + +;pm = ondemand +;pm.max_children = 4 +;pm.max_requests = 4000 +;pm.process_idle_timeout = 10s +;pm.status_path = /status + +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /home/%user%/tmp +;env[TMPDIR] = /home/%user%/tmp +;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/16.10/templates/web/php-fpm/socket.tpl b/install/ubuntu/16.10/templates/web/php-fpm/socket.tpl index f2dfbe8d..a0151084 100644 --- a/install/ubuntu/16.10/templates/web/php-fpm/socket.tpl +++ b/install/ubuntu/16.10/templates/web/php-fpm/socket.tpl @@ -8,14 +8,17 @@ group = %user% listen.owner = %user% listen.group = www-data -pm = dynamic -pm.max_children = 50 -pm.start_servers = 3 -pm.min_spare_servers = 2 -pm.max_spare_servers = 10 +pm = ondemand +pm.max_children = 4 +pm.max_requests = 4000 +pm.process_idle_timeout = 10s +pm.status_path = /status + +php_admin_value[upload_tmp_dir] = /home/%user%/tmp +php_admin_value[session.save_path] = /home/%user%/tmp env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp +env[TMP] = /home/%user%/tmp +env[TMPDIR] = /home/%user%/tmp +env[TEMP] = /home/%user%/tmp