From 7d52e00a51450bc4a080d4e21b7dda02c0a65191 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Thu, 14 Nov 2013 05:42:06 -0500 Subject: [PATCH] Fixed list sorting --- server/conf/php_fpm_pool.conf.master | 62 +++++++++++++++++++------------ 1 files changed, 38 insertions(+), 24 deletions(-) diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master index 6736647..b8fce17 100644 --- a/server/conf/php_fpm_pool.conf.master +++ b/server/conf/php_fpm_pool.conf.master @@ -1,25 +1,39 @@ -[<tmpl_var name='fpm_pool'>] - -listen = 127.0.0.1:<tmpl_var name='fpm_port'> - -listen.allowed_clients = 127.0.0.1 - -user = <tmpl_var name='fpm_user'> -group = <tmpl_var name='fpm_group'> - -pm = dynamic -pm.max_children = 50 -pm.start_servers = 20 -pm.min_spare_servers = 5 -pm.max_spare_servers = 35 - -chdir = / - -<tmpl_if name='security_level' op='==' value='20'> - -<tmpl_var name='enable_php_open_basedir'>php_admin_value[open_basedir] = <tmpl_var name='php_open_basedir'> -</tmpl_if> - -<tmpl_loop name="custom_php_ini_settings"> -<tmpl_var name='ini_setting'> +[<tmpl_var name='fpm_pool'>] + +<tmpl_if name='use_tcp'> +listen = 127.0.0.1:<tmpl_var name='fpm_port'> +listen.allowed_clients = 127.0.0.1 +</tmpl_if> +<tmpl_if name='use_socket'> +listen = <tmpl_var name='fpm_socket'> +listen.owner = <tmpl_var name='fpm_user'> +listen.group = <tmpl_var name='fpm_group'> +listen.mode = 0660 +</tmpl_if> + +user = <tmpl_var name='fpm_user'> +group = <tmpl_var name='fpm_group'> + +pm = <tmpl_var name='pm'> +pm.max_children = <tmpl_var name='pm_max_children'> +<tmpl_if name='pm' op='==' value='dynamic'> +pm.start_servers = <tmpl_var name='pm_start_servers'> +pm.min_spare_servers = <tmpl_var name='pm_min_spare_servers'> +pm.max_spare_servers = <tmpl_var name='pm_max_spare_servers'> +</tmpl_if> +<tmpl_if name='pm' op='==' value='ondemand'> +pm.process_idle_timeout = <tmpl_var name='pm_process_idle_timeout'>s; +</tmpl_if> +pm.max_requests = <tmpl_var name='pm_max_requests'> + +chdir = / + +<tmpl_if name='security_level' op='==' value='20'> +<tmpl_var name='enable_php_open_basedir'>php_admin_value[open_basedir] = <tmpl_var name='php_open_basedir'> +php_admin_value[session.save_path] = <tmpl_var name='document_root'>/tmp +php_admin_value[upload_tmp_dir] = <tmpl_var name='document_root'>/tmp +</tmpl_if> + +<tmpl_loop name="custom_php_ini_settings"> +<tmpl_var name='ini_setting'> </tmpl_loop> \ No newline at end of file -- Gitblit v1.9.1