diff --git a/conf/nginx.conf b/conf/nginx.conf index eef6ba5..4f7f0dd 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,8 @@ location __PATH__ { alias __FINALPATH__/; + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } client_max_body_size 100M; index index.php; default_type text/html; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 204588f..0b8df22 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -390,3 +390,11 @@ 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] = 64M + +; Common values to change to increase file upload limit +php_admin_value[upload_max_filesize] = 100M +php_admin_value[post_max_size] = 100M + +; Other common parameters +php_admin_value[max_execution_time] = 3600 +php_admin_value[max_input_time] = 3600 diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini deleted file mode 100644 index 3fbeb35..0000000 --- a/conf/php-fpm.ini +++ /dev/null @@ -1,7 +0,0 @@ -; Common values to change to increase file upload limit -upload_max_filesize = 100M -post_max_size = 100M - -; Other common parameters -max_execution_time = 3600 -max_input_time = 3600 diff --git a/scripts/backup b/scripts/backup index 5fc2c74..3e541ad 100644 --- a/scripts/backup +++ b/scripts/backup @@ -66,7 +66,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 c0b8fe2..7b7bdd5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -102,7 +102,6 @@ systemctl restart fail2ban #================================================= ynh_restore_file /etc/php5/fpm/pool.d/$app.conf -ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini" #================================================= # GENERIC FINALIZATION