Update change_url

scripts/change_url

@@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..."
+ynh_script_progression --message="Loading installation settings..." --weight=1
 
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
@@ -41,40 +41,23 @@ if [ -z $admin ]; then
 	if [ -z $admin ]; then
 		ynh_die --message="no admin user found"
 	fi;
-  ynh_app_setting_delete $app admin_user
+	ynh_app_setting_delete $app admin_user
 	ynh_app_setting_set $app admin $admin
 fi
 
 #=================================================
 # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..."
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-  # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
-  ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-
-  # Restore it if the upgrade fails
-  ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# CHECK PATHS SYNTAX
-#=================================================
 ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
 ynh_clean_setup () {
-  # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
+	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
-  ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
+	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
 
-  # Restore it if the upgrade fails
+	# Restore it if the upgrade fails
-  ynh_restore_upgradebackup
+	ynh_restore_upgradebackup
 }
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
@@ -98,35 +81,40 @@ fi
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
-# MODIFY URL IN NGINX CONF FILE
+# MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..."
+ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
 
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
-# Change the path in the nginx config file
+# Change the path in the NGINX config file
 if [ $change_path -eq 1 ]
 then
-  # Make a backup of the original nginx config file if modified
+	# Make a backup of the original NGINX config file if modified
-  ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
+	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-  domain="$old_domain"
+	# Set global variables for NGINX helper
-  path_url="$new_path"
+	domain="$old_domain"
-  # Create a dedicated nginx config
+	path_url="$new_path"
-  ynh_add_nginx_config
+	# Create a dedicated NGINX config
+	ynh_add_nginx_config
 fi
 
-# Change the domain for nginx
+# Change the domain for NGINX
 if [ $change_domain -eq 1 ]
 then
-  ynh_delete_file_checksum --file="$nginx_conf_path"
+	# Delete file checksum for the old conf file location
-  mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
+	ynh_delete_file_checksum --file="$nginx_conf_path"
-  # Store file checksum for the new config file location
+	mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
-  ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
+	# Store file checksum for the new config file location
+	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
 fi
 
 #=================================================
 # SPECIFIC MODIFICATIONS
 #=================================================
+# UPGRADING FRESHRSS
+#=================================================
+ynh_script_progression --message="Upgrading FreshRSS..." --weight=1
 
 ynh_exec_as $app $final_path/cli/reconfigure.php --auth_type http_auth --environment production --base_url https://$new_domain$new_path --title FreshRSS --api_enabled --db-type mysql --db-host localhost --db-user $db_name --db-password $db_pwd --db-base $db_name
 
@@ -135,7 +123,7 @@ ynh_exec_as $app $final_path/cli/reconfigure.php --auth_type http_auth --environ
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..."
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -143,4 +131,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for $app"
+ynh_script_progression --message="Change of URL completed for $app" --last