diff --git a/scripts/_common.sh b/scripts/_common.sh index 146de15..055ffdd 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -63,6 +63,19 @@ function perform_db_migrations { sudo -u $app $final_path/venv/bin/envdir $env_path $final_path/venv/bin/python $final_path/manage.py migrate } +function get_app_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) + data_path=$(ynh_app_setting_get --app=$app --key=data_path) + admin=$(ynh_app_setting_get --app=$app --key=admin) + secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) + admin_email=$(ynh_user_get_info --username=$admin --key="mail") + db_name=$(ynh_app_setting_get --app=$app --key=db_name) + db_user="$db_name" + db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/backup b/scripts/backup index 511536f..a01aa8b 100755 --- a/scripts/backup +++ b/scripts/backup @@ -25,10 +25,7 @@ ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -final_path=$(ynh_app_setting_get --app=$app --key=data_path) -domain=$(ynh_app_setting_get --app=$app --key=domain) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) +get_app_settings #================================================= # DECLARE DATA AND CONF FILES TO BACKUP diff --git a/scripts/change_url b/scripts/change_url index e3f6270..4e84165 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -22,8 +22,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= 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) +get_app_settings #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP diff --git a/scripts/install b/scripts/install index 5c2897b..fef2b4d 100755 --- a/scripts/install +++ b/scripts/install @@ -53,7 +53,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=admin_email --value=$admin_email ynh_app_setting_set --app=$app --key=random_key --value=$secret_key #================================================= diff --git a/scripts/remove b/scripts/remove index ad142e9..49d1143 100755 --- a/scripts/remove +++ b/scripts/remove @@ -15,11 +15,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -data_path=$(ynh_app_setting_get --app=$app --key=data_path) +get_app_settings #================================================= # STANDARD REMOVE diff --git a/scripts/restore b/scripts/restore index ac949b3..617b42a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -25,12 +25,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME -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) -db_user="$db_name" -data_path=$(ynh_app_setting_get --app=$app --key=data_path) +get_app_settings #================================================= # CHECK IF THE APP CAN BE RESTORED diff --git a/scripts/upgrade b/scripts/upgrade index 6e15cf1..11d1838 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,10 +15,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME -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) -data_path=$(ynh_app_setting_get --app=$app --key=data_path) +get_app_settings #================================================= # CHECK VERSION @@ -35,6 +32,7 @@ if [ -z "$data_path" ]; then ynh_app_setting_set --app=$app --key=data_path --value=$data_path ynh_app_setting_delete --app=$app --key=datadir ynh_app_setting_delete --app=$app --key=db_pwd + ynh_app_setting_delete --app=$app --key=admin_email fi #=================================================