From d25e027c8118e92b8cc419a4c56c99191cfb4cf2 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 22 Aug 2022 20:03:42 +0700 Subject: [PATCH 1/6] Trying to fix --- scripts/backup | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/backup b/scripts/backup index 14103b6..370370f 100755 --- a/scripts/backup +++ b/scripts/backup @@ -64,11 +64,13 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP MINIO #================================================= +ynh_secure_remove --file="$mc_path/outlinestorage" 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 +ynh_secure_remove --file="$final_path/outlinestorage" mv "$mc_path/outlinestorage" "$final_path/outlinestorage" chown -R outline:www-data "$final_path/outlinestorage" From 1ac8bf24ce8e2c84f30cbe3f019d591fbfb749a4 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 22 Aug 2022 20:03:54 +0700 Subject: [PATCH 2/6] Change version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 7339991..5336622 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Wiki and knowledge base for teams", "fr": "Wiki et base de connaissances pour les équipes" }, - "version": "0.65.2~ynh1", + "version": "0.65.2~ynh2", "url": "www.getoutline.com", "upstream": { "license": "BUSL-1.1", From 6d5c6bf6467117855f120ee5b876daf73254d943 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 22 Aug 2022 22:25:00 +0700 Subject: [PATCH 3/6] Update remove --- scripts/remove | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/remove b/scripts/remove index 1e4bd85..2baf0b1 100755 --- a/scripts/remove +++ b/scripts/remove @@ -107,6 +107,7 @@ ynh_script_progression --message="Removing Outline MinIO bucket..." --weight=1 pushd "$mc_path" ynh_exec_warn_less sudo -u minio ./mc rb minio/outlinestorage --force popd +ynh_secure_remove --file="$mc_path/outlinestorage" #================================================= # REMOVE NGINX CONFIGURATION From 1222106f061a8426081aa69c01da3d39ac130638 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 22 Aug 2022 22:53:24 +0700 Subject: [PATCH 4/6] As per linter --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 5336622..27f7e67 100644 --- a/manifest.json +++ b/manifest.json @@ -16,7 +16,7 @@ "userdoc": "https://www.getoutline.com/about", "code": "https://github.com/outline/outline" }, - "license": "AGPL-3.0-only", + "license": "BUSL-1.1", "maintainer": { "name": "Raoul de Limezy" }, From d1516e0ea12cc33c0ae3abb45e5509896c5a0963 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 22 Aug 2022 23:17:12 +0700 Subject: [PATCH 5/6] Fix --- scripts/upgrade | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 840d854..b04f9aa 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,6 +49,9 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 +# Ugly fix for an early mistake - to be removed with next upgrade +ynh_secure_remove --file="$final_path/outlinestorage" + # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { From 2880ce2ea16429a75505453740a85bc5a1070ca3 Mon Sep 17 00:00:00 2001 From: Limezy Date: Tue, 23 Aug 2022 00:42:14 +0700 Subject: [PATCH 6/6] fix2 --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index b04f9aa..1faef63 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,6 +51,7 @@ ynh_script_progression --message="Backing up the app before upgrading (may take # Ugly fix for an early mistake - to be removed with next upgrade ynh_secure_remove --file="$final_path/outlinestorage" +ynh_secure_remove --file="$mc_path/outlinestorage" # Backup the current version of the app ynh_backup_before_upgrade