diff --git a/recipes/default.rb b/recipes/default.rb index 3b104f169cba1508901fa498ef729f208f9d3cb4..a3129adbe7c26acd08058138b440607d882d475d 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -48,7 +48,7 @@ include_recipe 'apache2::mod_ssl' if node['platform_version'] == '16.04' package 'libapache2-mod-php7.0' - %w(php php-cli php-curl php-intl php-gd php-mcrypt php-mysql php-xml php-json php-mbstring ).each do |name| + %w(php php-cli php-curl php-intl php-gd php-mcrypt php-mysql php-xml php-json php-mbstring php-soap php-zip).each do |name| package name do action :install end @@ -74,7 +74,7 @@ end if node['platform_version'] == '16.04' replace_or_add 'Increase time limit' do - path '/etc/php/7.0/fpm/php.ini' + path '/etc/php/7.0/apache2/php.ini' pattern 'max_execution_time =.*' line 'max_execution_time = 240' end @@ -86,13 +86,13 @@ if node['platform_version'] == '16.04' end replace_or_add 'Increase memory limit' do - path '/etc/php/7.0/fpm/php.ini' + path '/etc/php/7.0/apache2/php.ini' pattern 'memory_limit =.*' line 'memory_limit = 256M' end replace_or_add 'Increase upload size limit' do - path '/etc/php/7.0/fpm/php.ini' + path '/etc/php/7.0/apache2/php.ini' pattern 'upload_max_filesize =.*' line 'upload_max_filesize = 10M' end @@ -104,7 +104,7 @@ if node['platform_version'] == '16.04' end replace_or_add 'Increase post_max_size limit' do - path '/etc/php/7.0/fpm/php.ini' + path '/etc/php/7.0/apache2/php.ini' pattern 'post_max_size =.*' line 'post_max_size = 10M' end @@ -116,16 +116,28 @@ if node['platform_version'] == '16.04' end replace_or_add 'Set date.timezone' do - path '/etc/php/7.0/fpm/php.ini' + path '/etc/php/7.0/apache2/php.ini' pattern 'date.timezone =.*' line 'date.timezone = Europe/Berlin' end - replace_or_add 'date.timezone - CLI' do + replace_or_add 'Set date.timezone - CLI' do path '/etc/php/7.0/cli/php.ini' pattern 'date.timezone =.*' line 'date.timezone = Europe/Berlin' end + + replace_or_add 'Set max_input_vars' do + path '/etc/php/7.0/apache2/php.ini' + pattern '.*max_input_vars =.*' + line 'max_input_vars = 1500' + end + + replace_or_add 'Set max_input_vars - CLI' do + path '/etc/php/7.0/cli/php.ini' + pattern '.*max_input_vars =.*' + line 'max_input_vars = 1500' + end else replace_or_add 'Increase time limit' do path '/etc/php5/apache2/php.ini'