Merge pull request #39 from castiron/gb/better-dev-defaults

mattheath · mattheath · commit 1f16757aa2e2 · 2014-06-01T23:50:17.000+01:00
Make .ini defaults a little bit more forgiving
diff --git a/spec/fixtures/nginx.conf b/spec/fixtures/nginx.conf
@@ -22,5 +22,9 @@ server {
     fastcgi_pass unix:/test/boxen/data/project-sockets/testproject;
     fastcgi_param SCRIPT_FILENAME /Users/testuser/src/testproject/www/index.php;
     fastcgi_param PATH_INFO $fastcgi_script_name;
+
+    fastcgi_read_timeout 3600s;
+    client_body_timeout 3600s;
+    send_timeout 3600s;
   }
 }
diff --git a/spec/fixtures/php-fpm-pool-custom.conf b/spec/fixtures/php-fpm-pool-custom.conf
@@ -159,7 +159,7 @@ ping.path = /ping
 ; 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 = 60s
+request_terminate_timeout = 3600s
 
 ; The timeout for serving a single request after which a PHP backtrace will be
 ; dumped to the 'slowlog' file. A value of '0s' means 'off'.
diff --git a/spec/fixtures/php-fpm-pool.conf b/spec/fixtures/php-fpm-pool.conf
@@ -159,7 +159,7 @@ ping.path = /ping
 ; 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 = 60s
+request_terminate_timeout = 3600s
 
 ; The timeout for serving a single request after which a PHP backtrace will be
 ; dumped to the 'slowlog' file. A value of '0s' means 'off'.
diff --git a/spec/fixtures/php.ini b/spec/fixtures/php.ini
@@ -437,7 +437,7 @@ expose_php = On
 ; Maximum execution time of each script, in seconds
 ; http://php.net/max-execution-time
 ; Note: This directive is hardcoded to 0 for the CLI SAPI
-max_execution_time = 30
+max_execution_time = 3600
 
 ; Maximum amount of time each script may spend parsing request data. It's a good
 ; idea to limit this time on productions servers in order to eliminate unexpectedly
@@ -447,15 +447,15 @@ max_execution_time = 30
 ; Development Value: 60 (60 seconds)
 ; Production Value: 60 (60 seconds)
 ; http://php.net/max-input-time
-max_input_time = 60
+max_input_time = 3600
 
 ; Maximum input variable nesting level
 ; http://php.net/max-input-nesting-level
 ;max_input_nesting_level = 64
 
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
-memory_limit = 128M
+memory_limit = 256M
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;
@@ -877,7 +877,7 @@ file_uploads = On
 
 ; Maximum allowed size for uploaded files.
 ; http://php.net/upload-max-filesize
-upload_max_filesize = 2M
+upload_max_filesize = 50M
 
 ; Maximum number of files that can be uploaded via a single request
 max_file_uploads = 20
@@ -905,7 +905,7 @@ allow_url_include = Off
 
 ; Default timeout for socket based streams (seconds)
 ; http://php.net/default-socket-timeout
-default_socket_timeout = 60
+default_socket_timeout = 3600
 
 ; If your scripts have to deal with files from Macintosh systems,
 ; or you are running on a Mac and need to deal with files from
diff --git a/spec/fixtures/xdebug.ini b/spec/fixtures/xdebug.ini
@@ -2,5 +2,5 @@ zend_extension=/test/boxen/phpenv/versions/5.4.17/modules/xdebug.so
 
 xdebug.file_link_format="txmt://open?url=file://%f&line=%1"
 xdebug.remote_enable = On
-xdebug.remote_autostart = 1
+xdebug.remote_autostart = 0
 xdebug.max_nesting_level = 300
diff --git a/templates/extensions/xdebug.ini.erb b/templates/extensions/xdebug.ini.erb
@@ -2,5 +2,5 @@ zend_extension=<%= @module_path %>
 
 xdebug.file_link_format="txmt://open?url=file://%f&line=%1"
 xdebug.remote_enable = On
-xdebug.remote_autostart = 1
+xdebug.remote_autostart = 0
 xdebug.max_nesting_level = 300
diff --git a/templates/nginx/nginx.conf.erb b/templates/nginx/nginx.conf.erb
@@ -22,5 +22,9 @@ server {
     fastcgi_pass unix:<%= scope.lookupvar "boxen::config::socketdir" %>/<%= @name %>;
     fastcgi_param SCRIPT_FILENAME <%= @repo_dir %>/www/index.php;
     fastcgi_param PATH_INFO $fastcgi_script_name;
+
+    fastcgi_read_timeout 3600s;
+    client_body_timeout 3600s;
+    send_timeout 3600s;
   }
 }
diff --git a/templates/php-fpm-pool.conf.erb b/templates/php-fpm-pool.conf.erb
@@ -159,7 +159,7 @@ ping.path = /ping
 ; 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 = 60s
+request_terminate_timeout = 3600s
 
 ; The timeout for serving a single request after which a PHP backtrace will be
 ; dumped to the 'slowlog' file. A value of '0s' means 'off'.
diff --git a/templates/php.ini.erb b/templates/php.ini.erb
@@ -437,7 +437,7 @@ expose_php = On
 ; Maximum execution time of each script, in seconds
 ; http://php.net/max-execution-time
 ; Note: This directive is hardcoded to 0 for the CLI SAPI
-max_execution_time = 30
+max_execution_time = 3600
 
 ; Maximum amount of time each script may spend parsing request data. It's a good
 ; idea to limit this time on productions servers in order to eliminate unexpectedly
@@ -447,15 +447,15 @@ max_execution_time = 30
 ; Development Value: 60 (60 seconds)
 ; Production Value: 60 (60 seconds)
 ; http://php.net/max-input-time
-max_input_time = 60
+max_input_time = 3600
 
 ; Maximum input variable nesting level
 ; http://php.net/max-input-nesting-level
 ;max_input_nesting_level = 64
 
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
-memory_limit = 128M
+memory_limit = 256M
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;
@@ -877,7 +877,7 @@ file_uploads = On
 
 ; Maximum allowed size for uploaded files.
 ; http://php.net/upload-max-filesize
-upload_max_filesize = 2M
+upload_max_filesize = 50M
 
 ; Maximum number of files that can be uploaded via a single request
 max_file_uploads = 20
@@ -905,7 +905,7 @@ allow_url_include = Off
 
 ; Default timeout for socket based streams (seconds)
 ; http://php.net/default-socket-timeout
-default_socket_timeout = 60
+default_socket_timeout = 3600
 
 ; If your scripts have to deal with files from Macintosh systems,
 ; or you are running on a Mac and need to deal with files from

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,9 @@ server {`
`22`	`22`	`fastcgi_pass unix:/test/boxen/data/project-sockets/testproject;`
`23`	`23`	`fastcgi_param SCRIPT_FILENAME /Users/testuser/src/testproject/www/index.php;`
`24`	`24`	`fastcgi_param PATH_INFO $fastcgi_script_name;`
	`25`	`+`
	`26`	`+ fastcgi_read_timeout 3600s;`
	`27`	`+ client_body_timeout 3600s;`
	`28`	`+ send_timeout 3600s;`
`25`	`29`	`}`
`26`	`30`	`}`