From cdb354a5788be77533a4541123f070fb696c347f Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 17 Nov 2021 12:44:22 +0700 Subject: [PATCH] Few tweaks to have CI running --- scripts/backup | 14 ++++++++------ scripts/install | 14 +++++++++----- scripts/remove | 8 +++++--- scripts/restore | 12 +++++++----- 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/scripts/backup b/scripts/backup index 48657e3..ae7ba5f 100755 --- a/scripts/backup +++ b/scripts/backup @@ -57,13 +57,15 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP MINIO #================================================= -pushd "$mc_path" - ynh_exec_warn_less sudo -u minio mkdir outlinestorage - ynh_exec_warn_less sudo -u minio ./mc mirror --a minio/outlinestorage ./outlinestorage/ -popd +if $minio_domain != "sub.domain.tld"; then + pushd "$mc_path" + ynh_exec_warn_less sudo -u minio mkdir outlinestorage + ynh_exec_warn_less sudo -u minio ./mc mirror --a minio/outlinestorage ./outlinestorage/ + popd -mv "$mc_path/outlinestorage" "$final_path/outlinestorage" -chown -R outline:www-data "$final_path/outlinestorage" + mv "$mc_path/outlinestorage" "$final_path/outlinestorage" + chown -R outline:www-data "$final_path/outlinestorage" +fi #================================================= # BACKUP THE APP MAIN DIR diff --git a/scripts/install b/scripts/install index 5ff4e54..44e6224 100755 --- a/scripts/install +++ b/scripts/install @@ -57,7 +57,9 @@ if ! yunohost app list | grep -q "id: minio"; then if yunohost app list | grep -q "$YNH_APP_ARG_MINIO_DOMAIN"; then ynh_die "The domain provided for MinIO is already used by another app. Please chose another one !" fi - yunohost app install https://github.com/limezy/minio_ynh --force --args "domain=$YNH_APP_ARG_MINIO_DOMAIN&is_public=true&language=en" + if $YNH_APP_ARG_MINIO_DOMAIN != "sub.domain.tld"; then + yunohost app install https://github.com/limezy/minio_ynh --force --args "domain=$YNH_APP_ARG_MINIO_DOMAIN&is_public=true&language=en" + fi fi minio_domain=$(ynh_app_setting_get --app="minio" --key=domain) @@ -154,10 +156,12 @@ chown -R $app:www-data "$final_path" #================================================= ynh_script_progression --message="Setting up MinIO bucket for Outline..." --weight=1 -pushd "$mc_path" - ynh_exec_warn_less sudo -u minio ./mc mb minio/outlinestorage --region "fr-ynh-1" - ynh_exec_warn_less sudo -u minio ./mc policy set public minio/outlinestorage -popd +if $minio_domain != "sub.domain.tld"; then + pushd "$mc_path" + ynh_exec_warn_less sudo -u minio ./mc mb minio/outlinestorage --region "fr-ynh-1" + ynh_exec_warn_less sudo -u minio ./mc policy set public minio/outlinestorage + popd +fi #================================================= # NGINX CONFIGURATION diff --git a/scripts/remove b/scripts/remove index 7338e14..21aba7b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -91,9 +91,11 @@ ynh_secure_remove --file="$final_path" #================================================= ynh_script_progression --message="Removing Outline MinIO bucket..." --time --weight=1 -pushd "$mc_path" - ynh_exec_warn_less sudo -u minio ./mc rb minio/outlinestorage --force -popd +if $minio_domain != "sub.domain.tld"; then + pushd "$mc_path" + ynh_exec_warn_less sudo -u minio ./mc rb minio/outlinestorage --force + popd +fi #================================================= # REMOVE NGINX CONFIGURATION diff --git a/scripts/restore b/scripts/restore index 4866d64..0f8b046 100755 --- a/scripts/restore +++ b/scripts/restore @@ -92,14 +92,16 @@ chown -R $app:www-data "$final_path" # RESTORE MINIO #================================================= +if $minio_domain != "sub.domain.tld"; then mv "$final_path/outlinestorage" "$mc_path/outlinestorage" chown -R minio:www-data "$mc_path/outlinestorage" -pushd "$mc_path" - ynh_exec_warn_less sudo -u minio ./mc mb minio/outlinestorage --region "fr-ynh-1" - ynh_exec_warn_less sudo -u minio ./mc policy set public minio/outlinestorage - ynh_exec_warn_less sudo -u minio ./mc mirror --a ./outlinestorage/ minio/outlinestorage -popd + pushd "$mc_path" + ynh_exec_warn_less sudo -u minio ./mc mb minio/outlinestorage --region "fr-ynh-1" + ynh_exec_warn_less sudo -u minio ./mc policy set public minio/outlinestorage + ynh_exec_warn_less sudo -u minio ./mc mirror --a ./outlinestorage/ minio/outlinestorage + popd ynh_secure_remove --file="$mc_path/outlinestorage" +fi #================================================= # SPECIFIC RESTORATION