From 5aaff5b039d93483a54584064c79005d6140ca1b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 16 May 2022 13:10:34 +0200 Subject: [PATCH 1/4] Upgrade to 0.7.2~ynh1 --- README.md | 2 +- README_fr.md | 2 +- check_process | 2 +- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- doc/DESCRIPTION.md | 2 +- manifest.json | 12 ++++++------ scripts/change_url | 1 + scripts/install | 2 +- scripts/upgrade | 4 ++-- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 3da7143..f2753c5 100755 --- a/README.md +++ b/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 diff --git a/README_fr.md b/README_fr.md index 106d408..17f236d 100644 --- a/README_fr.md +++ b/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 diff --git a/check_process b/check_process index b656f17..db2834d 100755 --- a/check_process +++ b/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 diff --git a/conf/amd64.src b/conf/amd64.src index 4c663f8..87bc748 100644 --- a/conf/amd64.src +++ b/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_SUM=be694c3a42fc82c724dcc00c11084b9681dfcd8eb2262102c31a9080d1ce66b3 +SOURCE_URL=https://github.com/Plume-org/Plume/releases/download/0.7.2/plume-postgres.tar.gz +SOURCE_SUM=1a8c5a931fef25920503c9ae577b1c180ba7709e88f3d47b077ae80e2d9ea9ef SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/arm64.src b/conf/arm64.src index b03a1b4..3eb2aa0 100644 --- a/conf/arm64.src +++ b/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_SUM=872d074c492e43d391f0f932e921adc0916ed58bd6388aaa591c966ce962f8be +SOURCE_URL=https://github.com/YunoHost-Apps/plume_ynh/releases/download/0.7.2/plume-arm64-postgres.tar.gz +SOURCE_SUM=921b3b209b2f3cb352c676ecb93730aa4732e239a53f59f1ec5f128d5b28ec42 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 04cfd65..9d66f62 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -Federated blogging engine, based on ActivityPub. It uses the Rocket framework, and Diesel to interact with the database. \ No newline at end of file +Federated blogging engine, based on ActivityPub. It uses the Rocket framework, and Diesel to interact with the database. diff --git a/manifest.json b/manifest.json index b5f9a20..dd18992 100755 --- a/manifest.json +++ b/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" diff --git a/scripts/change_url b/scripts/change_url index f89d7aa..6712587 100644 --- a/scripts/change_url +++ b/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" diff --git a/scripts/install b/scripts/install index f5b4b3e..7f5d814 100755 --- a/scripts/install +++ b/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 diff --git a/scripts/upgrade b/scripts/upgrade index aca4ab1..d20aa9d 100755 --- a/scripts/upgrade +++ b/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/ From 0d315878cbca56dfa1d376d8aca4db95fef9eca9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 16 May 2022 11:10:39 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f2753c5..dcb0244 100755 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -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. + **Shipped version:** 0.7.2~ynh1 diff --git a/README_fr.md b/README_fr.md index 17f236d..9aa05e7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -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. + **Version incluse :** 0.7.2~ynh1 From c766dc970f7a664538e7085e8cdb594e9f8dac97 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 16 May 2022 13:11:15 +0200 Subject: [PATCH 3/4] Typo --- doc/DISCLAIMER.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index ab397ec..a6d3793 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -8,4 +8,4 @@ #### Multi-user support -LDAP is activated but HTTP auth is not supported \ No newline at end of file +LDAP is activated but HTTP auth is not supported From 74a1c9a9cebadd508e8fa7321bca0c645706bab5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 16 May 2022 11:11:28 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index dcb0244..6d55145 100755 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ Federated blogging engine, based on ActivityPub. It uses the Rocket framework, a #### Multi-user support LDAP is activated but HTTP auth is not supported + ## Documentation and resources * Official app website: https://joinplu.me/ diff --git a/README_fr.md b/README_fr.md index 9aa05e7..a91536e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,6 +35,7 @@ Federated blogging engine, based on ActivityPub. It uses the Rocket framework, a #### Multi-user support LDAP is activated but HTTP auth is not supported + ## Documentations et ressources * Site officiel de l'app : https://joinplu.me/