Merge pull request #56 from Limezy/fix-backup

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",
@@ -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"
     },

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"
 

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

scripts/upgrade

@@ -49,6 +49,10 @@ 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"
+ynh_secure_remove --file="$mc_path/outlinestorage"
+
 # Backup the current version of the app
 ynh_backup_before_upgrade
 ynh_clean_setup () {