diff --git a/scripts/change_url b/scripts/change_url index 1813e6b..5af4643 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -19,12 +19,11 @@ ynh_script_progression --message="Loading installation settings..." # RETRIEVE ARGUMENTS old_domain=$YNH_APP_OLD_DOMAIN domain=$YNH_APP_NEW_DOMAIN -path_url=$(ynh_normalize_url_path --path_url $YNH_APP_NEW_PATH) +path_url=$YNH_APP_NEW_PATH app=$YNH_APP_INSTANCE_NAME port=$(ynh_app_setting_get --app $app --key web_port) admin=$(ynh_app_setting_get --app $app --key admin) -final_path=$(ynh_app_setting_get --app $app --key final_path) # Check if the new path stay /SOGo if not exit diff --git a/scripts/restore b/scripts/restore index 4731326..4b084cb 100755 --- a/scripts/restore +++ b/scripts/restore @@ -18,12 +18,8 @@ ynh_script_progression --message="Loading settings..." domain=$(ynh_app_setting_get --app $app --key domain) path_url=$(ynh_app_setting_get --app $app --key path) -final_path=$(ynh_app_setting_get --app $app --key final_path) db_name=$(ynh_app_setting_get --app $app --key db_name) - -# CHECK IF THE APP CAN BE RESTORED -ynh_webpath_available --domain $domain --path_url $path_url \ - || ynh_die --message "Path not available: ${domain}${path_url}" +db_user=$db_name #================================================= # STANDARD RESTORATION STEPS @@ -39,7 +35,6 @@ ynh_restore # RESTORE THE MYSQL DATABASE ynh_script_progression --message="Restoring database..." --weight=3 -db_user=$db_name db_pwd=$(ynh_app_setting_get --app $app --key mysqlpwd) ynh_mysql_setup_db --db_name $db_name --db_user $db_user --db_pwd $db_pwd ynh_mysql_connect_as --user $db_user --password $db_pwd --database $db_name < ./db.sql diff --git a/scripts/upgrade b/scripts/upgrade index c7e1e23..d01d50e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,7 @@ admin=$(ynh_app_setting_get --app $app --key admin) port=$(ynh_app_setting_get --app $app --key web_port) smtp_port=$(ynh_app_setting_get --app $app --key smtp_port) db_name=$(ynh_app_setting_get --app $app --key db_name) -db_user=$(ynh_app_setting_get --app $app --key db_user) +db_user=$db_name db_pwd=$(ynh_app_setting_get --app $app --key mysqlpwd) # Backup the current version of the app