Merge remote-tracking branch 'github/pull/89'

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

diff --git a/cookbooks/dev/templates/default/fpm.conf.erb b/cookbooks/dev/templates/default/fpm.conf.erb
index afbb1a7e279d8c8950bd1516432d85dcbd30315f..523d8ca8573630d68267bc1e371b8e217984b09d 100644 (file)
--- a/cookbooks/dev/templates/default/fpm.conf.erb
+++ b/cookbooks/dev/templates/default/fpm.conf.erb
@@ -1,13 +1,8 @@
 ; DO NOT EDIT - This file is being maintained by Chef
 
 [<%= @user %>]
-listen = /var/run/php5-fpm-<%= @user %>.sock
-
+listen = 127.0.0.1:<%= @port %>
 listen.backlog = 256
- 
-listen.owner = www-data
-listen.group = www-data
-listen.mode = 0660
 
 user = <%= @user %>
 group = <%= @user %>
@@ -47,4 +42,6 @@ php_flag[display_errors] = on
 ;php_admin_flag[log_errors] = on
 php_value[max_execution_time] = 300
 php_value[memory_limit] = 128M
+php_value[post_max_size] = 32M
+php_value[upload_max_filesize] = 32M