Update cookbooks

cookbooks/php-fpm/templates/default/pool.conf.erb

@@ -112,7 +112,7 @@ pm.max_children = <%= @max_children || 50 %>
 ; Note: Used only when pm is set to 'dynamic'
 ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
 <% if @start_servers %>
- pm.start_servers = <%= @start_servers %>
+pm.start_servers = <%= @start_servers %>
 <% end %>
 
 ; The desired minimum number of idle server processes.
@@ -257,7 +257,9 @@ pm.max_requests = <%= @max_requests || 500 %>
 
 ; The access log file
 ; Default: not set
-;access.log = log/$pool.access.log
+<% if @access_log %>
+access.log = <%= node['php-fpm']['log_dir'] %>/$pool.access.log
+<% end %>
 
 ; The access log format.
 ; The following syntax is allowed
@@ -330,7 +332,7 @@ pm.max_requests = <%= @max_requests || 500 %>
 ; does not stop script execution for some reason. A value of '0' means 'off'.
 ; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
 ; Default Value: 0
-;request_terminate_timeout = 0
+request_terminate_timeout = <%=@request_terminate_timeout || 0 %>
 
 ; Set open file descriptor rlimit.
 ; Default Value: system defined value
@@ -364,6 +366,7 @@ pm.max_requests = <%= @max_requests || 500 %>
 ; Default Value: no
 catch_workers_output = <%= @catch_workers_output || "no" %>
 
+<% if node['platform'] != 'ubuntu' && node['platform_version'] != '10.04' %>
 ; Limits the extensions of the main script FPM will allow to parse. This can
 ; prevent configuration mistakes on the web server side. You should only limit
 ; FPM to .php extensions to prevent malicious users to use other extensions to
@@ -372,6 +375,7 @@ catch_workers_output = <%= @catch_workers_output || "no" %>
 ; Default Value: .php
 ;security.limit_extensions = .php .php3 .php4 .php5
 security.limit_extensions = <%=@security_limit_extensions || ".php" %>
+<% end %>
 
 ; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
 ; the current environment.