From 5121efa39861613d5c23badfefb436fa6b0b70bc Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Fri, 10 Apr 2020 14:44:35 +0200 Subject: [PATCH] sripts modified, try to resolve change url --- scripts/change_url | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 87a60f7..683bfa0 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -29,23 +29,6 @@ ynh_script_progression --message="Loading installation settings..." --time --wei # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before changing its url (may take a while)..." --time --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. - 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 THE SYNTAX OF THE PATHS # #================================================= @@ -86,6 +69,7 @@ then # Make a backup of the original nginx config file if modified # ynh_backup_if_checksum_is_different --file="$nginx_conf_path" # Set global variables for nginx helper + domain="$old_domain" path_url="$new_path" # Create a dedicated nginx config ynh_add_nginx_config @@ -102,11 +86,11 @@ fi # Change the domain for nginx if [ $change_domain -eq 1 ] then - # Delete file checksum for the old conf file location + # Delete file checksum for the old conf file location ynh_delete_file_checksum --file="$nginx_conf_path" mv $nginx_conf_path /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" + #ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi #=================================================