From dd7ce4758a19791c5e884ac30098a1deafcbf055 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Fri, 04 May 2012 07:16:50 -0400
Subject: [PATCH] - Implemented FS#1888 and FS#2211.

---
 server/conf/php_fpm_pool.conf.master |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master
index cd1ba12..b8fce17 100644
--- a/server/conf/php_fpm_pool.conf.master
+++ b/server/conf/php_fpm_pool.conf.master
@@ -14,11 +14,17 @@
 user = <tmpl_var name='fpm_user'>
 group = <tmpl_var name='fpm_group'>
 
-pm = dynamic
+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 = /
 

--
Gitblit v1.9.1