allow changing php memory_limit

cogini · Apr 29, 2015 · 462cd1b · 462cd1b
1 parent 3ea90b8
commit 462cd1b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/php/attributes/default.rb b/php/attributes/default.rb
@@ -26,6 +26,7 @@
 default[:php][:upload_max_filesize] = "2M"
 default[:php][:max_execution_time] = 30
 default[:php][:max_file_uploads] = 20
+default[:php][:memory_limit] = "128M"
 default[:php][:error_reporting] = 'E_ALL & ~E_DEPRECATED'
 
 default[:php][:fpm][:catch_workers_output] = 'yes'

diff --git a/php/templates/default/php.ini.erb b/php/templates/default/php.ini.erb
@@ -22,7 +22,7 @@ disable_classes =
 expose_php = Off
 max_execution_time = <%= php[:max_execution_time] %>
 max_input_time = 60
-memory_limit = 128M
+memory_limit = <%= php[:memory_limit] %>
 error_reporting = <%= php[:error_reporting] %>
 display_errors = Off
 display_startup_errors = Off