1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mygpo_ynh.git synced 2024-09-03 19:55:52 +02:00

Refactor app settings retreival

This commit is contained in:
Jules Bertholet 2021-04-27 14:52:37 -04:00
parent 91ae5072a1
commit d74bbf587a
7 changed files with 19 additions and 22 deletions

View file

@ -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
#=================================================

View file

@ -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

View file

@ -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

View file

@ -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
#=================================================

View file

@ -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

View file

@ -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

View file

@ -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
#=================================================