From 4b9fa68aaad90fe0d38c1fecd6c699911e452591 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 2 Apr 2022 16:24:41 +0700 Subject: [PATCH] Should work ! --- scripts/backup | 7 +++---- scripts/change_url | 7 +++---- scripts/install | 2 -- scripts/remove | 7 +++---- scripts/restore | 8 +++----- scripts/upgrade | 7 +++---- 6 files changed, 15 insertions(+), 23 deletions(-) diff --git a/scripts/backup b/scripts/backup index 7d284a7..14103b6 100755 --- a/scripts/backup +++ b/scripts/backup @@ -36,10 +36,9 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) language_key=$(ynh_app_setting_get --app=$app --key=language_key) secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret) -minio_domain=$(ynh_app_setting_get --app=$app --key=domain) -minio_admin=$(ynh_app_setting_get --app=$app --key=admin) -minio_password=$(ynh_app_setting_get --app=$app --key=password) -minio_key=$(ynh_app_setting_get --app=$app --key=minio_key) +minio_domain=$(ynh_app_setting_get --app=$app --key=minio_domain) +minio_admin=$(ynh_app_setting_get --app=$app --key=minio_admin) +minio_password=$(ynh_app_setting_get --app=$app --key=minio_password) mc_path=$(ynh_app_setting_get --app=$app --key=mc_path) dex_app=$(ynh_app_setting_get --app=$app --key=dex_app) dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain) diff --git a/scripts/change_url b/scripts/change_url index df258f7..3be27d0 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -35,10 +35,9 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) language_key=$(ynh_app_setting_get --app=$app --key=language_key) secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret) -minio_domain=$(ynh_app_setting_get --app=$app --key=domain) -minio_admin=$(ynh_app_setting_get --app=$app --key=admin) -minio_password=$(ynh_app_setting_get --app=$app --key=password) -minio_key=$(ynh_app_setting_get --app=$app --key=minio_key) +minio_domain=$(ynh_app_setting_get --app=$app --key=minio_domain) +minio_admin=$(ynh_app_setting_get --app=$app --key=minio_admin) +minio_password=$(ynh_app_setting_get --app=$app --key=minio_password) mc_path=$(ynh_app_setting_get --app=$app --key=mc_path) dex_app=$(ynh_app_setting_get --app=$app --key=dex_app) dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain) diff --git a/scripts/install b/scripts/install index 23b31f4..bffc5d6 100755 --- a/scripts/install +++ b/scripts/install @@ -60,7 +60,6 @@ fi minio_domain=$(ynh_app_setting_get --app="minio" --key=domain) minio_admin=$(ynh_app_setting_get --app="minio" --key=admin) minio_password=$(ynh_app_setting_get --app="minio" --key=password) -minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key) mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path) #================================================= @@ -119,7 +118,6 @@ ynh_app_setting_set --app=$app --key=language_key --value=$language_key ynh_app_setting_set --app=$app --key=minio_domain --value=$minio_domain ynh_app_setting_set --app=$app --key=minio_admin --value=$minio_admin ynh_app_setting_set --app=$app --key=minio_password --value=$minio_password -ynh_app_setting_set --app=$app --key=minio_key --value=$minio_key ynh_app_setting_set --app=$app --key=mc_path --value=$mc_path ynh_app_setting_set --app=$app --key=dex_app --value=$dex_app ynh_app_setting_set --app=$app --key=dex_domain --value=$dex_domain diff --git a/scripts/remove b/scripts/remove index 859665b..1e4bd85 100755 --- a/scripts/remove +++ b/scripts/remove @@ -24,10 +24,9 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) language_key=$(ynh_app_setting_get --app=$app --key=language_key) secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret) -minio_domain=$(ynh_app_setting_get --app=$app --key=domain) -minio_admin=$(ynh_app_setting_get --app=$app --key=admin) -minio_password=$(ynh_app_setting_get --app=$app --key=password) -minio_key=$(ynh_app_setting_get --app=$app --key=minio_key) +minio_domain=$(ynh_app_setting_get --app=$app --key=minio_domain) +minio_admin=$(ynh_app_setting_get --app=$app --key=minio_admin) +minio_password=$(ynh_app_setting_get --app=$app --key=minio_password) mc_path=$(ynh_app_setting_get --app=$app --key=mc_path) dex_app=$(ynh_app_setting_get --app=$app --key=dex_app) dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain) diff --git a/scripts/restore b/scripts/restore index 561fd4d..b4e3fe3 100755 --- a/scripts/restore +++ b/scripts/restore @@ -36,10 +36,9 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) language_key=$(ynh_app_setting_get --app=$app --key=language_key) secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret) -minio_domain=$(ynh_app_setting_get --app=$app --key=domain) -minio_admin=$(ynh_app_setting_get --app=$app --key=admin) -minio_password=$(ynh_app_setting_get --app=$app --key=password) -minio_key=$(ynh_app_setting_get --app=$app --key=minio_key) +minio_domain=$(ynh_app_setting_get --app=$app --key=minio_domain) +minio_admin=$(ynh_app_setting_get --app=$app --key=minio_admin) +minio_password=$(ynh_app_setting_get --app=$app --key=minio_password) mc_path=$(ynh_app_setting_get --app=$app --key=mc_path) dex_app=$(ynh_app_setting_get --app=$app --key=dex_app) dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain) @@ -71,7 +70,6 @@ if ! yunohost app list | grep -q "id: $dex_app"; then ynh_die "The domain provided for Dex is already used by another app. Please chose another one !" fi yunohost app install https://github.com/YunoHost-Apps/dex_ynh --force --args "domain=$dex_domain&path=$dex_path&OIDC_name=$oidc_name&OIDC_secret=$oidc_secret&OIDC_callback=$oidc_callback" - fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 67261b0..40b5dd5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,10 +24,9 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) language_key=$(ynh_app_setting_get --app=$app --key=language_key) secret_key=$(ynh_app_setting_get --app=$app --key=secret_key) utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret) -minio_domain=$(ynh_app_setting_get --app=$app --key=domain) -minio_admin=$(ynh_app_setting_get --app=$app --key=admin) -minio_password=$(ynh_app_setting_get --app=$app --key=password) -minio_key=$(ynh_app_setting_get --app=$app --key=minio_key) +minio_domain=$(ynh_app_setting_get --app=$app --key=minio_domain) +minio_admin=$(ynh_app_setting_get --app=$app --key=minio_admin) +minio_password=$(ynh_app_setting_get --app=$app --key=minio_password) mc_path=$(ynh_app_setting_get --app=$app --key=mc_path) dex_app=$(ynh_app_setting_get --app=$app --key=dex_app) dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain)