diff --git a/conf/nginx.conf b/conf/nginx.conf index 13d7d68..5eed09a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -8,6 +8,7 @@ location __PATH__/ { client_body_timeout 60m; proxy_read_timeout 60m; fastcgi_read_timeout 60m; + client_max_body_size 50M; try_files $uri @__NAME__; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 92164b8..2670862 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -390,3 +390,7 @@ catch_workers_output = yes ;php_admin_value[error_log] = /var/log/fpm-php.www.log ;php_admin_flag[log_errors] = on ;php_admin_value[memory_limit] = 32M + +php_admin_value[max_execution_time] = 3600 +php_admin_value[upload_max_filesize] = 50M +php_admin_value[post_max_size] = 50M diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini deleted file mode 100644 index 89e7572..0000000 --- a/conf/php-fpm.ini +++ /dev/null @@ -1 +0,0 @@ -max_execution_time=3600 \ No newline at end of file diff --git a/scripts/backup b/scripts/backup index 52d6e9c..0d42f42 100644 --- a/scripts/backup +++ b/scripts/backup @@ -45,7 +45,6 @@ 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" #================================================= # BACKUP MYSQL DB diff --git a/scripts/restore b/scripts/restore index c10e79d..3e82943 100644 --- a/scripts/restore +++ b/scripts/restore @@ -81,7 +81,6 @@ chown -R $app: $final_path #================================================= ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf" -ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini" #================================================= # GENERIC FINALIZATION