From 6a2e19bf089d8872aabb18508dcb8f5c72249518 Mon Sep 17 00:00:00 2001
From: Limezy <arnaudetpia@de-ruffray.fr>
Date: Thu, 17 Feb 2022 15:01:40 +0700
Subject: [PATCH] Removal of minio_id

---
 conf/.env          | 2 +-
 scripts/backup     | 1 -
 scripts/change_url | 1 -
 scripts/install    | 1 -
 scripts/remove     | 1 -
 scripts/restore    | 1 -
 scripts/upgrade    | 1 -
 7 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/conf/.env b/conf/.env
index dd4323a..4f629bd 100644
--- a/conf/.env
+++ b/conf/.env
@@ -41,7 +41,7 @@ COLLABORATION_URL=
 # A more detailed guide on setting up S3 is available here:
 # => https://wiki.generaloutline.com/share/125de1cc-9ff6-424b-8415-0d58c809a40f
 #
-AWS_ACCESS_KEY_ID=__MINIO_ID__
+AWS_ACCESS_KEY_ID=minio
 AWS_SECRET_ACCESS_KEY=__MINIO_KEY__
 AWS_REGION=fr-ynh-1
 AWS_S3_UPLOAD_BUCKET_URL=https://__MINIO_DOMAIN__
diff --git a/scripts/backup b/scripts/backup
index 0650966..aa826ad 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -39,7 +39,6 @@ slack_secret=$(ynh_app_setting_get --app=$app --key=slack_secret)
 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="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
 
diff --git a/scripts/change_url b/scripts/change_url
index 8abf6bb..84a524e 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -38,7 +38,6 @@ slack_secret=$(ynh_app_setting_get --app=$app --key=slack_secret)
 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="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
 
diff --git a/scripts/install b/scripts/install
index 899fb4d..05b8ba6 100755
--- a/scripts/install
+++ b/scripts/install
@@ -61,7 +61,6 @@ if ! yunohost app list | grep -q "id: minio"; then
 fi
 
 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=app)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
 
diff --git a/scripts/remove b/scripts/remove
index 7338e14..7fc17c9 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -28,7 +28,6 @@ utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret)
 
 
 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
 
diff --git a/scripts/restore b/scripts/restore
index 1b427e3..6f6687c 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -48,7 +48,6 @@ slack_secret=$(ynh_app_setting_get --app=$app --key=slack_secret)
 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="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 8199ce3..14abc17 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -27,7 +27,6 @@ slack_secret=$(ynh_app_setting_get --app=$app --key=slack_secret)
 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="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)