From e3dd2fc34d299677e317adc841c7039d9dafda7d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 2 Oct 2022 15:03:25 +0200 Subject: [PATCH] Reorder script --- scripts/restore | 3 ++- scripts/upgrade | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/scripts/restore b/scripts/restore index b6b0285..b2c6068 100755 --- a/scripts/restore +++ b/scripts/restore @@ -40,7 +40,8 @@ timezone="$(cat /etc/timezone)" #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path \ + || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS diff --git a/scripts/upgrade b/scripts/upgrade index 431a9ff..dde1f09 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -96,14 +96,6 @@ chmod -R g+w $final_path/media/files/ chmod -R g+w $final_path/media/images/ chmod -R g+w $final_path/translations/ -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=10 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -119,6 +111,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=10 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # RELOAD NGINX #=================================================