Upgrade to 0.7.2~ynh1

README.md

@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Federated blogging engine, based on ActivityPub. It uses the Rocket framework, and Diesel to interact with the database. 
 
-**Shipped version:** 0.7.1~ynh2
+**Shipped version:** 0.7.2~ynh1
 
 **Demo:** https://joinplu.me/#instances
 

README_fr.md

@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Federated blogging engine, based on ActivityPub. It uses the Rocket framework, and Diesel to interact with the database. 
 
-**Version incluse :** 0.7.1~ynh2
+**Version incluse :** 0.7.2~ynh1
 
 **Démo :** https://joinplu.me/#instances
 

check_process

@@ -1,8 +1,8 @@
 ;; Test complet
 	; Manifest
 		domain="domain.tld"
-		admin="john"
 		is_public=1
+		admin="john"
 		password="pass"
 		name="my blog"
 		registration=0

conf/amd64.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Plume-org/Plume/releases/download/0.7.1/plume-postgres.tar.gz
+SOURCE_URL=https://github.com/Plume-org/Plume/releases/download/0.7.2/plume-postgres.tar.gz
-SOURCE_SUM=be694c3a42fc82c724dcc00c11084b9681dfcd8eb2262102c31a9080d1ce66b3
+SOURCE_SUM=1a8c5a931fef25920503c9ae577b1c180ba7709e88f3d47b077ae80e2d9ea9ef
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false

conf/arm64.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/YunoHost-Apps/plume_ynh/releases/download/0.7.1/plume-arm64-postgres.tar.gz
+SOURCE_URL=https://github.com/YunoHost-Apps/plume_ynh/releases/download/0.7.2/plume-arm64-postgres.tar.gz
-SOURCE_SUM=872d074c492e43d391f0f932e921adc0916ed58bd6388aaa591c966ce962f8be
+SOURCE_SUM=921b3b209b2f3cb352c676ecb93730aa4732e239a53f59f1ec5f128d5b28ec42
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false

doc/DESCRIPTION.md

@@ -1 +1 @@
-Federated blogging engine, based on ActivityPub. It uses the Rocket framework, and Diesel to interact with the database. 
+Federated blogging engine, based on ActivityPub. It uses the Rocket framework, and Diesel to interact with the database.

manifest.json

@@ -6,7 +6,7 @@
         "en": "Federated blogging application",
         "fr": "Application de blogging fédérée"
     },
-    "version": "0.7.1~ynh2",
+    "version": "0.7.2~ynh1",
     "url": "https://joinplu.me/",
     "upstream": {
         "license": "AGPL-3.0-only",
@@ -20,7 +20,7 @@
         "name": "yalh76"
     },
     "requirements": {
-        "yunohost": ">= 4.3.1.8"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
@@ -32,15 +32,15 @@
                 "name": "domain",
                 "type": "domain"
             },
-            {
-                "name": "admin",
-                "type": "user"
-            },
             {
                 "name": "is_public",
                 "type": "boolean",
                 "default": true
             },
+            {
+                "name": "admin",
+                "type": "user"
+            },
             {
                 "name": "password",
                 "type": "password"

scripts/change_url

@@ -37,6 +37,7 @@ ynh_script_progression --message="Backing up the app before changing its URL (ma
 # Backup the current version of the app
 ynh_backup_before_upgrade
 ynh_clean_setup () {
+	ynh_clean_check_starting
 	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
 	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
 

scripts/install

@@ -25,8 +25,8 @@ ynh_abort_if_errors
 
 domain=$YNH_APP_ARG_DOMAIN
 path_url="/"
-admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
+admin=$YNH_APP_ARG_ADMIN
 password=$YNH_APP_ARG_PASSWORD
 instance_name=$YNH_APP_ARG_NAME
 registration=$YNH_APP_ARG_REGISTRATION

scripts/upgrade

@@ -42,9 +42,9 @@ ynh_script_progression --message="Backing up the app before upgrading (may take
 # Backup the current version of the app
 ynh_backup_before_upgrade
 ynh_clean_setup () {
+	ynh_clean_check_starting
 	# Restore it if the upgrade fails
 	ynh_restore_upgradebackup
-	ynh_clean_check_starting
 }
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
@@ -107,7 +107,7 @@ then
 	ynh_script_progression --message="Upgrading source files..."
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path/$app" --source_id=$architecture
+	ynh_setup_source --dest_dir="$final_path/$app" --source_id=$architecture --keep="$app/.env"
 
 	# Move binaries
 	mv $final_path/$app/bin/* $final_path/.cargo/bin/