diff --git a/scripts/backup b/scripts/backup index 3115901..54e1793 100755 --- a/scripts/backup +++ b/scripts/backup @@ -10,22 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_print_info --message="Loading installation settings..." - -#REMOVEME? utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret) -#REMOVEME? dex_app=$(ynh_app_setting_get --app=$app --key=dex_app) -#REMOVEME? dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain) -#REMOVEME? dex_path=$(ynh_app_setting_get --app=$app --key=dex_path) -#REMOVEME? oidc_secret=$(ynh_app_setting_get --app=$app --key=oidc_secret) -#REMOVEME? oidc_name=$(ynh_app_setting_get --app=$app --key=oidc_name) -#REMOVEME? oidc_callback=$(ynh_app_setting_get --app=$app --key=oidc_callback) -#REMOVEME? dex_auth_uri=$(ynh_app_setting_get --app=$app --key=dex_auth_uri) -#REMOVEME? dex_token_uri=$(ynh_app_setting_get --app=$app --key=dex_token_uri) -#REMOVEME? dex_user_uri=$(ynh_app_setting_get --app=$app --key=dex_user_uri) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= diff --git a/scripts/change_url b/scripts/change_url index 7842d35..41f7d60 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,22 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret) -#REMOVEME? dex_app=$(ynh_app_setting_get --app=$app --key=dex_app) -#REMOVEME? dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain) -#REMOVEME? dex_path=$(ynh_app_setting_get --app=$app --key=dex_path) -#REMOVEME? oidc_secret=$(ynh_app_setting_get --app=$app --key=oidc_secret) -#REMOVEME? oidc_name=$(ynh_app_setting_get --app=$app --key=oidc_name) -#REMOVEME? oidc_callback=$(ynh_app_setting_get --app=$app --key=oidc_callback) -#REMOVEME? dex_auth_uri=$(ynh_app_setting_get --app=$app --key=dex_auth_uri) -#REMOVEME? dex_token_uri=$(ynh_app_setting_get --app=$app --key=dex_token_uri) -#REMOVEME? dex_user_uri=$(ynh_app_setting_get --app=$app --key=dex_user_uri) - #================================================= # STANDARD MODIFICATIONS #================================================= diff --git a/scripts/install b/scripts/install index 24a7b37..708e3b1 100755 --- a/scripts/install +++ b/scripts/install @@ -26,7 +26,7 @@ oidc_secret=$(ynh_hex_32_random) oidc_name="Outline" oidc_callback="$domain/auth/oidc.callback" -#REMOVEME? if yunohost app list | grep -q "$YNH_APP_ARG_DEX_DOMAIN$YNH_APP_ARG_DEX_PATH"; then +if yunohost app list | grep -q "$YNH_APP_ARG_DEX_DOMAIN$YNH_APP_ARG_DEX_PATH"; then ynh_die "The domain provided for Dex is already used by another app. Please chose another one !" fi @@ -49,12 +49,10 @@ fi #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1 +ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=utils_secret --value=$utils_secret ynh_app_setting_set --app=$app --key=dex_app --value=$dex_app -#REMOVEME? ynh_app_setting_set --app=$app --key=dex_domain --value=$dex_domain -#REMOVEME? ynh_app_setting_set --app=$app --key=dex_path --value=$dex_path ynh_app_setting_set --app=$app --key=oidc_name --value=$oidc_name ynh_app_setting_set --app=$app --key=oidc_secret --value=$oidc_secret ynh_app_setting_set --app=$app --key=oidc_callback --value=$oidc_callback diff --git a/scripts/remove b/scripts/remove index 6d22c0b..67b02f6 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,22 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret) -#REMOVEME? dex_app=$(ynh_app_setting_get --app=$app --key=dex_app) -#REMOVEME? dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain) -#REMOVEME? dex_path=$(ynh_app_setting_get --app=$app --key=dex_path) -#REMOVEME? oidc_secret=$(ynh_app_setting_get --app=$app --key=oidc_secret) -#REMOVEME? oidc_name=$(ynh_app_setting_get --app=$app --key=oidc_name) -#REMOVEME? oidc_callback=$(ynh_app_setting_get --app=$app --key=oidc_callback) -#REMOVEME? dex_auth_uri=$(ynh_app_setting_get --app=$app --key=dex_auth_uri) -#REMOVEME? dex_token_uri=$(ynh_app_setting_get --app=$app --key=dex_token_uri) -#REMOVEME? dex_user_uri=$(ynh_app_setting_get --app=$app --key=dex_user_uri) - #================================================= # STANDARD REMOVE #================================================= diff --git a/scripts/restore b/scripts/restore index ea9be00..7363cd6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,24 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret) -#REMOVEME? dex_app=$(ynh_app_setting_get --app=$app --key=dex_app) -#REMOVEME? dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain) -#REMOVEME? dex_path=$(ynh_app_setting_get --app=$app --key=dex_path) -#REMOVEME? oidc_secret=$(ynh_app_setting_get --app=$app --key=oidc_secret) -#REMOVEME? oidc_name=$(ynh_app_setting_get --app=$app --key=oidc_name) -#REMOVEME? oidc_callback=$(ynh_app_setting_get --app=$app --key=oidc_callback) -#REMOVEME? dex_auth_uri=$(ynh_app_setting_get --app=$app --key=dex_auth_uri) -#REMOVEME? dex_token_uri=$(ynh_app_setting_get --app=$app --key=dex_token_uri) -#REMOVEME? dex_user_uri=$(ynh_app_setting_get --app=$app --key=dex_user_uri) - #================================================= # CHECK IF DEX IS INSTALLED, IF NOT INSTALL IT #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e3a2c06..12cd69a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,22 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret) -#REMOVEME? dex_app=$(ynh_app_setting_get --app=$app --key=dex_app) -#REMOVEME? dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain) -#REMOVEME? dex_path=$(ynh_app_setting_get --app=$app --key=dex_path) -#REMOVEME? oidc_secret=$(ynh_app_setting_get --app=$app --key=oidc_secret) -#REMOVEME? oidc_name=$(ynh_app_setting_get --app=$app --key=oidc_name) -#REMOVEME? oidc_callback=$(ynh_app_setting_get --app=$app --key=oidc_callback) -#REMOVEME? dex_auth_uri=$(ynh_app_setting_get --app=$app --key=dex_auth_uri) -#REMOVEME? dex_token_uri=$(ynh_app_setting_get --app=$app --key=dex_token_uri) -#REMOVEME? dex_user_uri=$(ynh_app_setting_get --app=$app --key=dex_user_uri) - #================================================= # CHECK VERSION #=================================================