Ignore .kitchen.local.yml

[chef.git] / cookbooks / nominatim / templates / default / fpm.conf.erb

diff --git a/cookbooks/nominatim/templates/default/fpm.conf.erb b/cookbooks/nominatim/templates/default/fpm.conf.erb
index 78b1c01a523a39ec04af5d54ffff7a01dc58bb67..386769efcc42956fc7285e94131940cbbc0cd781 100644 (file)
--- a/cookbooks/nominatim/templates/default/fpm.conf.erb
+++ b/cookbooks/nominatim/templates/default/fpm.conf.erb
@@ -1,7 +1,13 @@
 ; DO NOT EDIT - This file is being maintained by Chef
 
 [<%= @name %>]
 ; DO NOT EDIT - This file is being maintained by Chef
 
 [<%= @name %>]

+<% if @port -%>
+listen = 127.0.0.1:<%= @port %>
+<% else -%>

 listen = /var/run/php5-fpm-<%= @name %>.sock
 listen = /var/run/php5-fpm-<%= @name %>.sock

+listen.owner = www-data
+listen.group = www-data
+<% end -%>

 
 user = www-data
 group = www-data
 
 user = www-data
 group = www-data


@@ -9,8 +15,8 @@ group = www-data
 pm = <%= @pm %>
 pm.max_children = <%= @max_children %>
 pm.start_servers = 20
 pm = <%= @pm %>
 pm.max_children = <%= @max_children %>
 pm.start_servers = 20

-pm.min_spare_servers = 20
-pm.max_spare_servers = 30
-pm.max_requests = 1000000
+pm.min_spare_servers = 10
+pm.max_spare_servers = 20
+pm.max_requests = 10000

 
 security.limit_extensions = .php .phpx .phpj
 
 security.limit_extensions = .php .phpx .phpj