Преглед изворни кода

ondemand instead of dynamic php-fpm

Serghey Rodin пре 8 година
родитељ
комит
6bcebeaba5
53 измењених фајлова са 494 додато и 361 уклоњено
  1. 6 5
      install/debian/7/php5-fpm/www.conf
  2. 5 5
      install/debian/7/templates/web/php5-fpm/default.tpl
  3. 14 7
      install/debian/7/templates/web/php5-fpm/no-php.tpl
  4. 13 10
      install/debian/7/templates/web/php5-fpm/socket.tpl
  5. 6 5
      install/debian/8/php5-fpm/www.conf
  6. 5 5
      install/debian/8/templates/web/php5-fpm/default.tpl
  7. 14 7
      install/debian/8/templates/web/php5-fpm/no-php.tpl
  8. 13 10
      install/debian/8/templates/web/php5-fpm/socket.tpl
  9. 5 5
      install/rhel/5/php-fpm/www.conf
  10. 11 8
      install/rhel/5/templates/web/php-fpm/default.tpl
  11. 14 11
      install/rhel/5/templates/web/php-fpm/socket.tpl
  12. 5 5
      install/rhel/6/php-fpm/www.conf
  13. 5 5
      install/rhel/6/templates/web/php-fpm/default.tpl
  14. 14 11
      install/rhel/6/templates/web/php-fpm/socket.tpl
  15. 5 5
      install/rhel/7/php-fpm/www.conf
  16. 5 5
      install/rhel/7/templates/web/php-fpm/default.tpl
  17. 14 11
      install/rhel/7/templates/web/php-fpm/socket.tpl
  18. 6 5
      install/ubuntu/12.04/php-fpm/www.conf
  19. 5 5
      install/ubuntu/12.04/templates/web/php-fpm/default.tpl
  20. 14 7
      install/ubuntu/12.04/templates/web/php-fpm/no-php.tpl
  21. 13 10
      install/ubuntu/12.04/templates/web/php-fpm/socket.tpl
  22. 6 5
      install/ubuntu/12.10/php-fpm/www.conf
  23. 5 5
      install/ubuntu/12.10/templates/web/php-fpm/default.tpl
  24. 14 7
      install/ubuntu/12.10/templates/web/php-fpm/no-php.tpl
  25. 13 10
      install/ubuntu/12.10/templates/web/php-fpm/socket.tpl
  26. 6 5
      install/ubuntu/13.04/php-fpm/www.conf
  27. 5 5
      install/ubuntu/13.04/templates/web/php-fpm/default.tpl
  28. 14 7
      install/ubuntu/13.04/templates/web/php-fpm/no-php.tpl
  29. 13 10
      install/ubuntu/13.04/templates/web/php-fpm/socket.tpl
  30. 6 5
      install/ubuntu/13.10/php-fpm/www.conf
  31. 5 5
      install/ubuntu/13.10/templates/web/php-fpm/default.tpl
  32. 14 7
      install/ubuntu/13.10/templates/web/php-fpm/no-php.tpl
  33. 13 10
      install/ubuntu/13.10/templates/web/php-fpm/socket.tpl
  34. 6 5
      install/ubuntu/14.04/php-fpm/www.conf
  35. 5 5
      install/ubuntu/14.04/templates/web/php-fpm/default.tpl
  36. 14 7
      install/ubuntu/14.04/templates/web/php-fpm/no-php.tpl
  37. 13 10
      install/ubuntu/14.04/templates/web/php-fpm/socket.tpl
  38. 6 5
      install/ubuntu/14.10/php-fpm/www.conf
  39. 5 5
      install/ubuntu/14.10/templates/web/php-fpm/default.tpl
  40. 14 7
      install/ubuntu/14.10/templates/web/php-fpm/no-php.tpl
  41. 13 10
      install/ubuntu/14.10/templates/web/php-fpm/socket.tpl
  42. 6 5
      install/ubuntu/15.04/php-fpm/www.conf
  43. 5 5
      install/ubuntu/15.04/templates/web/php-fpm/default.tpl
  44. 14 7
      install/ubuntu/15.04/templates/web/php-fpm/no-php.tpl
  45. 13 10
      install/ubuntu/15.04/templates/web/php-fpm/socket.tpl
  46. 6 5
      install/ubuntu/15.10/php-fpm/www.conf
  47. 5 5
      install/ubuntu/15.10/templates/web/php-fpm/default.tpl
  48. 14 7
      install/ubuntu/15.10/templates/web/php-fpm/no-php.tpl
  49. 13 10
      install/ubuntu/15.10/templates/web/php-fpm/socket.tpl
  50. 6 5
      install/ubuntu/16.10/php-fpm/www.conf
  51. 5 5
      install/ubuntu/16.10/templates/web/php-fpm/default.tpl
  52. 14 7
      install/ubuntu/16.10/templates/web/php-fpm/no-php.tpl
  53. 11 8
      install/ubuntu/16.10/templates/web/php-fpm/socket.tpl

+ 6 - 5
install/debian/7/php5-fpm/www.conf

@@ -1,10 +1,11 @@
 [www]
 [www]
 listen = 127.0.0.1:9000
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
+
 user = www-data
 user = www-data
 group = 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

+ 5 - 5
install/debian/7/templates/web/php5-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 7
install/debian/7/templates/web/php5-fpm/no-php.tpl

@@ -1,13 +1,20 @@
 ;[%backend%]
 ;[%backend%]
+;listen = /dev/null
+
 ;user = %user%
 ;user = %user%
 ;group = %user%
 ;group = %user%
-;listen = /dev/null
 
 
 ;listen.owner = %user%
 ;listen.owner = %user%
-;listen.group = nginx
+;listen.group = www-data
+
+;pm = ondemand
+;pm.max_children = 4
+;pm.max_requests = 4000
+;pm.process_idle_timeout = 10s
+;pm.status_path = /status
 
 
-;pm = dynamic
-;pm.max_children = 50
-;pm.start_servers = 3
-;pm.min_spare_servers = 2
-;pm.max_spare_servers = 10
+;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

+ 13 - 10
install/debian/7/templates/web/php5-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php/%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %user%
 group = %user%
 
 
-listen.owner = www-data
+listen.owner = %user%
 listen.group = www-data
 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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 6 - 5
install/debian/8/php5-fpm/www.conf

@@ -1,10 +1,11 @@
 [www]
 [www]
 listen = 127.0.0.1:9000
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
+
 user = www-data
 user = www-data
 group = 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

+ 5 - 5
install/debian/8/templates/web/php5-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 7
install/debian/8/templates/web/php5-fpm/no-php.tpl

@@ -1,13 +1,20 @@
 ;[%backend%]
 ;[%backend%]
+;listen = /dev/null
+
 ;user = %user%
 ;user = %user%
 ;group = %user%
 ;group = %user%
-;listen = /dev/null
 
 
 ;listen.owner = %user%
 ;listen.owner = %user%
-;listen.group = nginx
+;listen.group = www-data
+
+;pm = ondemand
+;pm.max_children = 4
+;pm.max_requests = 4000
+;pm.process_idle_timeout = 10s
+;pm.status_path = /status
 
 
-;pm = dynamic
-;pm.max_children = 50
-;pm.start_servers = 3
-;pm.min_spare_servers = 2
-;pm.max_spare_servers = 10
+;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

+ 13 - 10
install/debian/8/templates/web/php5-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php/%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %user%
 group = %user%
 
 
-listen.owner = www-data
+listen.owner = %user%
 listen.group = www-data
 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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 5 - 5
install/rhel/5/php-fpm/www.conf

@@ -3,8 +3,8 @@ listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 user = apache
 user = apache
 group = 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

+ 11 - 8
install/rhel/5/templates/web/php-fpm/default.tpl

@@ -5,14 +5,17 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 14 - 11
install/rhel/5/templates/web/php-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php-%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 5 - 5
install/rhel/6/php-fpm/www.conf

@@ -3,8 +3,8 @@ listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 user = apache
 user = apache
 group = 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

+ 5 - 5
install/rhel/6/templates/web/php-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 11
install/rhel/6/templates/web/php-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php-%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 5 - 5
install/rhel/7/php-fpm/www.conf

@@ -3,8 +3,8 @@ listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 user = apache
 user = apache
 group = 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

+ 5 - 5
install/rhel/7/templates/web/php-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 11
install/rhel/7/templates/web/php-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php-%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 6 - 5
install/ubuntu/12.04/php-fpm/www.conf

@@ -1,10 +1,11 @@
 [www]
 [www]
 listen = 127.0.0.1:9000
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
+
 user = www-data
 user = www-data
 group = 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

+ 5 - 5
install/ubuntu/12.04/templates/web/php-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 7
install/ubuntu/12.04/templates/web/php-fpm/no-php.tpl

@@ -1,13 +1,20 @@
 ;[%backend%]
 ;[%backend%]
+;listen = /dev/null
+
 ;user = %user%
 ;user = %user%
 ;group = %user%
 ;group = %user%
-;listen = /dev/null
 
 
 ;listen.owner = %user%
 ;listen.owner = %user%
-;listen.group = nginx
+;listen.group = www-data
+
+;pm = ondemand
+;pm.max_children = 4
+;pm.max_requests = 4000
+;pm.process_idle_timeout = 10s
+;pm.status_path = /status
 
 
-;pm = dynamic
-;pm.max_children = 50
-;pm.start_servers = 3
-;pm.min_spare_servers = 2
-;pm.max_spare_servers = 10
+;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

+ 13 - 10
install/ubuntu/12.04/templates/web/php-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php/%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %user%
 group = %user%
 
 
-listen.owner = www-data
+listen.owner = %user%
 listen.group = www-data
 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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 6 - 5
install/ubuntu/12.10/php-fpm/www.conf

@@ -1,10 +1,11 @@
 [www]
 [www]
 listen = 127.0.0.1:9000
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
+
 user = www-data
 user = www-data
 group = 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

+ 5 - 5
install/ubuntu/12.10/templates/web/php-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 7
install/ubuntu/12.10/templates/web/php-fpm/no-php.tpl

@@ -1,13 +1,20 @@
 ;[%backend%]
 ;[%backend%]
+;listen = /dev/null
+
 ;user = %user%
 ;user = %user%
 ;group = %user%
 ;group = %user%
-;listen = /dev/null
 
 
 ;listen.owner = %user%
 ;listen.owner = %user%
-;listen.group = nginx
+;listen.group = www-data
+
+;pm = ondemand
+;pm.max_children = 4
+;pm.max_requests = 4000
+;pm.process_idle_timeout = 10s
+;pm.status_path = /status
 
 
-;pm = dynamic
-;pm.max_children = 50
-;pm.start_servers = 3
-;pm.min_spare_servers = 2
-;pm.max_spare_servers = 10
+;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

+ 13 - 10
install/ubuntu/12.10/templates/web/php-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php/%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %user%
 group = %user%
 
 
-listen.owner = www-data
+listen.owner = %user%
 listen.group = www-data
 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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 6 - 5
install/ubuntu/13.04/php-fpm/www.conf

@@ -1,10 +1,11 @@
 [www]
 [www]
 listen = 127.0.0.1:9000
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
+
 user = www-data
 user = www-data
 group = 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

+ 5 - 5
install/ubuntu/13.04/templates/web/php-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 7
install/ubuntu/13.04/templates/web/php-fpm/no-php.tpl

@@ -1,13 +1,20 @@
 ;[%backend%]
 ;[%backend%]
+;listen = /dev/null
+
 ;user = %user%
 ;user = %user%
 ;group = %user%
 ;group = %user%
-;listen = /dev/null
 
 
 ;listen.owner = %user%
 ;listen.owner = %user%
-;listen.group = nginx
+;listen.group = www-data
+
+;pm = ondemand
+;pm.max_children = 4
+;pm.max_requests = 4000
+;pm.process_idle_timeout = 10s
+;pm.status_path = /status
 
 
-;pm = dynamic
-;pm.max_children = 50
-;pm.start_servers = 3
-;pm.min_spare_servers = 2
-;pm.max_spare_servers = 10
+;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

+ 13 - 10
install/ubuntu/13.04/templates/web/php-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php/%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %user%
 group = %user%
 
 
-listen.owner = www-data
+listen.owner = %user%
 listen.group = www-data
 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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 6 - 5
install/ubuntu/13.10/php-fpm/www.conf

@@ -1,10 +1,11 @@
 [www]
 [www]
 listen = 127.0.0.1:9000
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
+
 user = www-data
 user = www-data
 group = 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

+ 5 - 5
install/ubuntu/13.10/templates/web/php-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 7
install/ubuntu/13.10/templates/web/php-fpm/no-php.tpl

@@ -1,13 +1,20 @@
 ;[%backend%]
 ;[%backend%]
+;listen = /dev/null
+
 ;user = %user%
 ;user = %user%
 ;group = %user%
 ;group = %user%
-;listen = /dev/null
 
 
 ;listen.owner = %user%
 ;listen.owner = %user%
-;listen.group = nginx
+;listen.group = www-data
+
+;pm = ondemand
+;pm.max_children = 4
+;pm.max_requests = 4000
+;pm.process_idle_timeout = 10s
+;pm.status_path = /status
 
 
-;pm = dynamic
-;pm.max_children = 50
-;pm.start_servers = 3
-;pm.min_spare_servers = 2
-;pm.max_spare_servers = 10
+;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

+ 13 - 10
install/ubuntu/13.10/templates/web/php-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php/%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %user%
 group = %user%
 
 
-listen.owner = www-data
+listen.owner = %user%
 listen.group = www-data
 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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 6 - 5
install/ubuntu/14.04/php-fpm/www.conf

@@ -1,10 +1,11 @@
 [www]
 [www]
 listen = 127.0.0.1:9000
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
+
 user = www-data
 user = www-data
 group = 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

+ 5 - 5
install/ubuntu/14.04/templates/web/php-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 7
install/ubuntu/14.04/templates/web/php-fpm/no-php.tpl

@@ -1,13 +1,20 @@
 ;[%backend%]
 ;[%backend%]
+;listen = /dev/null
+
 ;user = %user%
 ;user = %user%
 ;group = %user%
 ;group = %user%
-;listen = /dev/null
 
 
 ;listen.owner = %user%
 ;listen.owner = %user%
-;listen.group = nginx
+;listen.group = www-data
+
+;pm = ondemand
+;pm.max_children = 4
+;pm.max_requests = 4000
+;pm.process_idle_timeout = 10s
+;pm.status_path = /status
 
 
-;pm = dynamic
-;pm.max_children = 50
-;pm.start_servers = 3
-;pm.min_spare_servers = 2
-;pm.max_spare_servers = 10
+;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

+ 13 - 10
install/ubuntu/14.04/templates/web/php-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php/%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %user%
 group = %user%
 
 
-listen.owner = www-data
+listen.owner = %user%
 listen.group = www-data
 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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 6 - 5
install/ubuntu/14.10/php-fpm/www.conf

@@ -1,10 +1,11 @@
 [www]
 [www]
 listen = 127.0.0.1:9000
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
+
 user = www-data
 user = www-data
 group = 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

+ 5 - 5
install/ubuntu/14.10/templates/web/php-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 7
install/ubuntu/14.10/templates/web/php-fpm/no-php.tpl

@@ -1,13 +1,20 @@
 ;[%backend%]
 ;[%backend%]
+;listen = /dev/null
+
 ;user = %user%
 ;user = %user%
 ;group = %user%
 ;group = %user%
-;listen = /dev/null
 
 
 ;listen.owner = %user%
 ;listen.owner = %user%
-;listen.group = nginx
+;listen.group = www-data
+
+;pm = ondemand
+;pm.max_children = 4
+;pm.max_requests = 4000
+;pm.process_idle_timeout = 10s
+;pm.status_path = /status
 
 
-;pm = dynamic
-;pm.max_children = 50
-;pm.start_servers = 3
-;pm.min_spare_servers = 2
-;pm.max_spare_servers = 10
+;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

+ 13 - 10
install/ubuntu/14.10/templates/web/php-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php/%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %user%
 group = %user%
 
 
-listen.owner = www-data
+listen.owner = %user%
 listen.group = www-data
 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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 6 - 5
install/ubuntu/15.04/php-fpm/www.conf

@@ -1,10 +1,11 @@
 [www]
 [www]
 listen = 127.0.0.1:9000
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
+
 user = www-data
 user = www-data
 group = 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

+ 5 - 5
install/ubuntu/15.04/templates/web/php-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 7
install/ubuntu/15.04/templates/web/php-fpm/no-php.tpl

@@ -1,13 +1,20 @@
 ;[%backend%]
 ;[%backend%]
+;listen = /dev/null
+
 ;user = %user%
 ;user = %user%
 ;group = %user%
 ;group = %user%
-;listen = /dev/null
 
 
 ;listen.owner = %user%
 ;listen.owner = %user%
-;listen.group = nginx
+;listen.group = www-data
+
+;pm = ondemand
+;pm.max_children = 4
+;pm.max_requests = 4000
+;pm.process_idle_timeout = 10s
+;pm.status_path = /status
 
 
-;pm = dynamic
-;pm.max_children = 50
-;pm.start_servers = 3
-;pm.min_spare_servers = 2
-;pm.max_spare_servers = 10
+;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

+ 13 - 10
install/ubuntu/15.04/templates/web/php-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php/%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %user%
 group = %user%
 
 
-listen.owner = www-data
+listen.owner = %user%
 listen.group = www-data
 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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 6 - 5
install/ubuntu/15.10/php-fpm/www.conf

@@ -1,10 +1,11 @@
 [www]
 [www]
 listen = 127.0.0.1:9000
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
+
 user = www-data
 user = www-data
 group = 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

+ 5 - 5
install/ubuntu/15.10/templates/web/php-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 7
install/ubuntu/15.10/templates/web/php-fpm/no-php.tpl

@@ -1,13 +1,20 @@
 ;[%backend%]
 ;[%backend%]
+;listen = /dev/null
+
 ;user = %user%
 ;user = %user%
 ;group = %user%
 ;group = %user%
-;listen = /dev/null
 
 
 ;listen.owner = %user%
 ;listen.owner = %user%
-;listen.group = nginx
+;listen.group = www-data
+
+;pm = ondemand
+;pm.max_children = 4
+;pm.max_requests = 4000
+;pm.process_idle_timeout = 10s
+;pm.status_path = /status
 
 
-;pm = dynamic
-;pm.max_children = 50
-;pm.start_servers = 3
-;pm.min_spare_servers = 2
-;pm.max_spare_servers = 10
+;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

+ 13 - 10
install/ubuntu/15.10/templates/web/php-fpm/socket.tpl

@@ -1,21 +1,24 @@
 [%backend%]
 [%backend%]
-listen = /var/run/php5-%backend%.sock
+listen = /var/run/php/%backend%.sock
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
 
 
 user = %user%
 user = %user%
 group = %user%
 group = %user%
 
 
-listen.owner = www-data
+listen.owner = %user%
 listen.group = www-data
 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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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

+ 6 - 5
install/ubuntu/16.10/php-fpm/www.conf

@@ -1,10 +1,11 @@
 [www]
 [www]
 listen = 127.0.0.1:9000
 listen = 127.0.0.1:9000
 listen.allowed_clients = 127.0.0.1
 listen.allowed_clients = 127.0.0.1
+
 user = www-data
 user = www-data
 group = 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

+ 5 - 5
install/ubuntu/16.10/templates/web/php-fpm/default.tpl

@@ -5,11 +5,11 @@ listen.allowed_clients = 127.0.0.1
 user = %user%
 user = %user%
 group = %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[upload_tmp_dir] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp
 php_admin_value[session.save_path] = /home/%user%/tmp

+ 14 - 7
install/ubuntu/16.10/templates/web/php-fpm/no-php.tpl

@@ -1,13 +1,20 @@
 ;[%backend%]
 ;[%backend%]
+;listen = /dev/null
+
 ;user = %user%
 ;user = %user%
 ;group = %user%
 ;group = %user%
-;listen = /dev/null
 
 
 ;listen.owner = %user%
 ;listen.owner = %user%
-;listen.group = nginx
+;listen.group = www-data
+
+;pm = ondemand
+;pm.max_children = 4
+;pm.max_requests = 4000
+;pm.process_idle_timeout = 10s
+;pm.status_path = /status
 
 
-;pm = dynamic
-;pm.max_children = 50
-;pm.start_servers = 3
-;pm.min_spare_servers = 2
-;pm.max_spare_servers = 10
+;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

+ 11 - 8
install/ubuntu/16.10/templates/web/php-fpm/socket.tpl

@@ -8,14 +8,17 @@ group = %user%
 listen.owner = %user%
 listen.owner = %user%
 listen.group = www-data
 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[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 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