From 2144864c94c3cf314a86b288e1f4dcc40ab88a4d Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 25 Mar 2020 17:40:27 +0100 Subject: [PATCH 1/3] Fix weight --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 726c428..b3aa75a 100644 --- a/scripts/restore +++ b/scripts/restore @@ -96,7 +96,7 @@ ynh_install_php --phpversion="$YNH_PHP_VERSION" --package="$extra_pkg_dependenci #================================================= # RESTORE THE POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Restoring the PostgreSQL database..."--weight=47 +ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=47 ynh_psql_test_if_first_run From b9607208200a28e0dfa7eeeaa2dfbf760c7faefb Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 27 Mar 2020 13:53:46 +0100 Subject: [PATCH 2/3] Fix cron task --- conf/cron | 2 +- scripts/install | 1 + scripts/upgrade | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/cron b/conf/cron index f38896d..95790c9 100644 --- a/conf/cron +++ b/conf/cron @@ -1 +1 @@ -*/15 * * * * /usr/bin/php__YNH_PHP_VERSION__ __FINAL_PATH__/admin/cli/cron.php >/dev/null +*/15 * * * * __APP__ /usr/bin/php__YNH_PHP_VERSION__ -f __FINAL_PATH__/admin/cli/cron.php diff --git a/scripts/install b/scripts/install index b1a8a47..21f4e35 100644 --- a/scripts/install +++ b/scripts/install @@ -157,6 +157,7 @@ exec_as "$app" php$YNH_PHP_VERSION "$final_path/admin/cli/purge_caches.php" # Set up poller sudo cp "../conf/cron" "/etc/cron.d/$app" +ynh_replace_string "__APP__" "$app" "/etc/cron.d/$app" ynh_replace_string "__FINAL_PATH__" "$final_path" "/etc/cron.d/$app" ynh_replace_string "__YNH_PHP_VERSION__" "$YNH_PHP_VERSION" "/etc/cron.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index 3492317..80abc43 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -131,6 +131,7 @@ chown -R "$app": "$final_path" # Set up poller sudo cp "../conf/cron" "/etc/cron.d/$app" +ynh_replace_string "__APP__" "$app" "/etc/cron.d/$app" ynh_replace_string "__FINAL_PATH__" "$final_path" "/etc/cron.d/$app" ynh_replace_string "__YNH_PHP_VERSION__" "$YNH_PHP_VERSION" "/etc/cron.d/$app" From 4a8314ce7ae652bc1df7daf88f266d6cebf9c8ce Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 27 Mar 2020 13:54:08 +0100 Subject: [PATCH 3/3] Increase upload_max_filesize --- conf/nginx.conf | 3 +-- conf/php-fpm.conf | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1efbff7..062cca2 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,8 +11,7 @@ location __PATH__/ { index index.php; - # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - #client_max_body_size 50M; + client_max_body_size 1G; try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index ab1a471..77b381e 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -419,12 +419,12 @@ chdir = __FINALPATH__ ;php_admin_value[memory_limit] = 32M ; Common values to change to increase file upload limit -; php_admin_value[upload_max_filesize] = 50M -; php_admin_value[post_max_size] = 50M +php_admin_value[upload_max_filesize] = 1G +php_admin_value[post_max_size] = 1G ; php_admin_flag[mail.add_x_header] = Off ; Other common parameters ; php_admin_value[max_execution_time] = 600 ; php_admin_value[max_input_time] = 300 ; php_admin_value[memory_limit] = 256M -; php_admin_flag[short_open_tag] = On +; php_admin_flag[short_open_tag] = On \ No newline at end of file