diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 7bad39e..cec73f5 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -389,4 +389,7 @@ catch_workers_output = yes ;php_flag[display_errors] = off ;php_admin_value[error_log] = /var/log/fpm-php.www.log ;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M \ No newline at end of file +;php_admin_value[memory_limit] = 32M + +php_admin_value[upload_max_filesize] = 30M +php_admin_value[post_max_size] = 30M diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini deleted file mode 100644 index 55e2ba7..0000000 --- a/conf/php-fpm.ini +++ /dev/null @@ -1,3 +0,0 @@ -upload_max_filesize=30M -post_max_size=30M -; max_execution_time=60 \ No newline at end of file diff --git a/scripts/backup b/scripts/backup index 6433b6e..01e8284 100644 --- a/scripts/backup +++ b/scripts/backup @@ -44,4 +44,3 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= ynh_backup "/etc/php5/fpm/pool.d/$app.conf" -ynh_backup "/etc/php5/fpm/conf.d/20-$app.ini" diff --git a/scripts/restore b/scripts/restore index 2840545..9551f33 100644 --- a/scripts/restore +++ b/scripts/restore @@ -66,7 +66,6 @@ chown -R $app:root $final_path/{data,tmp} #================================================= ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf" -ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini" #================================================= # GENERIC FINALIZATION