From 769d3ff118f6cf1bfc75da3304104e6753770372 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 17 Aug 2023 17:40:03 +0000 Subject: [PATCH 1/6] Auto-update README --- README.md | 3 ++- README_fr.md | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6f0c152..ece57d9 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Scuttlebutt Room for YunoHost -[![Integration level](https://dash.yunohost.org/integration/ssbroom.svg)](https://dash.yunohost.org/appci/app/ssbroom) ![Working status](https://ci-apps.yunohost.org/ci/badges/ssbroom.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/ssbroom.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/ssbroom.svg)](https://dash.yunohost.org/appci/app/ssbroom) ![Working status](https://ci-apps.yunohost.org/ci/badges/ssbroom.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/ssbroom.maintain.svg) + [![Install Scuttlebutt Room with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ssbroom) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 0402859..18a6df3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # Scuttlebutt Room pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/ssbroom.svg)](https://dash.yunohost.org/appci/app/ssbroom) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/ssbroom.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/ssbroom.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/ssbroom.svg)](https://dash.yunohost.org/appci/app/ssbroom) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/ssbroom.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/ssbroom.maintain.svg) + [![Installer Scuttlebutt Room avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ssbroom) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Scuttlebutt Room rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Scuttlebutt Room rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble A Scuttlebutt room is a service for connecting scuttlebutt users. @@ -34,9 +35,9 @@ For a comprehensive introduction to rooms 2.0, watch [this video](https://www.yo **Démo :** https://hermies.club/ -## Captures d'écran +## Captures d’écran -![Capture d'écran de Scuttlebutt Room](./doc/screenshots/ssbroom-screenshot.png) +![Capture d’écran de Scuttlebutt Room](./doc/screenshots/ssbroom-screenshot.png) ## Avertissements / informations importantes @@ -45,10 +46,10 @@ For a comprehensive introduction to rooms 2.0, watch [this video](https://www.yo * ssb rooms work best when the app is in public mode. ssb-room has its own user and authentication system, and doesn't need yunohost SSO ## Documentations et ressources -* Site officiel de l'app : +* Site officiel de l’app : * Documentation officielle utilisateur : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -64,4 +65,4 @@ ou sudo yunohost app upgrade ssbroom -u https://github.com/YunoHost-Apps/ssbroom_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 49e91bbd87e796da85db02c3e2e8ea4c6dbd6c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 17 Aug 2023 19:45:50 +0200 Subject: [PATCH 2/6] fix --- conf/amd64.src | 2 +- conf/arm64.src | 2 +- conf/arm7.src | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index f80fcc2..6ede8de 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://files.commoninternet.net/go-ssb-room_2.0.6_Linux_amd64.tar.gz +SOURCE_URL=https://github.com/YunoHost-Apps/ssbroom_ynh/releases/download/v2.0.6/go-ssb-room_2.0.6_Linux_amd64.tar.gz SOURCE_SUM=1a1c4368df219e907e15996bd6d62b653f54017993b1cc607ab09a9a01fb8558 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz diff --git a/conf/arm64.src b/conf/arm64.src index 606d438..7c9a708 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://files.commoninternet.net/go-ssb-room_2.0.6_Linux_aarch64.tar.gz +SOURCE_URL=https://github.com/YunoHost-Apps/ssbroom_ynh/releases/download/v2.0.6/go-ssb-room_2.0.6_Linux_aarch64.tar.gz SOURCE_SUM=8f9d357d54fd8bdc1c2e906919ddefef21ae51b13e5ae1939424c6c1e94c9d23 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz diff --git a/conf/arm7.src b/conf/arm7.src index d648c9d..ba86c16 100644 --- a/conf/arm7.src +++ b/conf/arm7.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://files.commoninternet.net/go-ssb-room_2.0.6_Linux_arm7.tar.gz +SOURCE_URL=https://github.com/YunoHost-Apps/ssbroom_ynh/releases/download/v2.0.6/go-ssb-room_2.0.6_Linux_arm7.tar.gz SOURCE_SUM=8894b7b21031976e1d79265fefdcef4edb6fde38f34231e8aea4cebcc85a4f88 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz From 7a3d9a52e9af6e3d90b42066a560041778ea9e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 17 Aug 2023 20:41:30 +0200 Subject: [PATCH 3/6] Update manifest.json --- manifest.json | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/manifest.json b/manifest.json index d8d081e..ce1c298 100644 --- a/manifest.json +++ b/manifest.json @@ -3,13 +3,13 @@ "id": "ssbroom", "packaging_format": 1, "description": { - "en": "Secure Scuttlebutt room server implemented in Go" + "en": "Secure Scuttlebutt room server", + "fr": "Serveur de salon Scuttlebutt sécurisé" }, - "version": "2.0.6~ynh5", + "version": "2.0.6~ynh6", "url": "https://github.com/ssb-ngi-pointer/go-ssb-room", "upstream": { - "license": "free", - "website": "https://github.com/ssb-ngi-pointer/go-ssb-room", + "license": "AGPL-3.0", "demo": "https://hermies.club/", "admindoc": "https://github.com/ssb-ngi-pointer/go-ssb-room/blob/master/README.md", "userdoc": "https://github.com/ssb-ngi-pointer/go-ssb-room/blob/master/README.md", @@ -21,7 +21,7 @@ "email": "max@mfowler.info" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.2" }, "multi_instance": true, "services": [ @@ -38,17 +38,20 @@ "type": "boolean", "default": true, "help": { - "en": "If false, ssbroom will only be usable by yunohost users." + "en": "If false, ssbroom will only be usable by YunoHost users.", + "fr": "Si false, ssbroom ne sera utilisable que par les utilisateurs de YunoHost." } }, { "name": "ssb_admin_id", "type": "string", "ask": { - "en": "SSB ID of first admin of the room" + "en": "SSB ID of first admin of the room", + "fr": "ID SSB du premier administrateur de la salle" }, "help": { - "en": "This ssb_id is used as the username for the first admin of the room. Create an ssb account or use your already existing ssb account, and use your ssb public key as the room admin id." + "en": "This ssb_id is used as the username for the first admin of the room. Create an SSB account or use your already existing SSB account, and use your SSB public key as the room admin ID.", + "fr": "Ce ssb_id est utilisé comme nom d'utilisateur pour le premier administrateur de la salle. Créez un compte SSB ou utilisez votre compte SSB déjà existant et utilisez votre clé publique SSB comme ID de salle." }, "example": "@5Pt3dKy2HTJ0mWuS78oIiklIX0gBz6BTfEnXsbvke9c=.ed25519" }, @@ -56,7 +59,8 @@ "name": "password", "type": "password", "help": { - "en": "Use this password to log into the admin interface for the ssb room." + "en": "Use this password to log into the admin interface for the SSB room.", + "fr": "Utilisez ce mot de passe pour vous connecter à l'interface d'administration de la salle SSB." } } ] From 678ab6f31ac263cf1c31e577e70e0228268896bb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 17 Aug 2023 18:41:35 +0000 Subject: [PATCH 4/6] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ece57d9..0d3a2d0 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ For a comprehensive introduction to rooms 2.0, watch [this video](https://www.yo - HTTP Invites - Alias management -**Shipped version:** 2.0.6~ynh5 +**Shipped version:** 2.0.6~ynh6 **Demo:** https://hermies.club/ @@ -46,7 +46,6 @@ For a comprehensive introduction to rooms 2.0, watch [this video](https://www.yo * ssb rooms work best when the app is in public mode. ssb-room has its own user and authentication system, and doesn't need yunohost SSO ## Documentation and resources -* Official app website: * Official user documentation: * Official admin documentation: * Upstream app code repository: diff --git a/README_fr.md b/README_fr.md index 18a6df3..daccf10 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ For a comprehensive introduction to rooms 2.0, watch [this video](https://www.yo - HTTP Invites - Alias management -**Version incluse :** 2.0.6~ynh5 +**Version incluse :** 2.0.6~ynh6 **Démo :** https://hermies.club/ @@ -46,7 +46,6 @@ For a comprehensive introduction to rooms 2.0, watch [this video](https://www.yo * ssb rooms work best when the app is in public mode. ssb-room has its own user and authentication system, and doesn't need yunohost SSO ## Documentations et ressources -* Site officiel de l’app : * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : From 2ce74c69c2c4eeb922734e84bee5513356caf974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 17 Aug 2023 20:43:44 +0200 Subject: [PATCH 5/6] fix --- scripts/_common.sh | 2 -- scripts/install | 3 +-- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index e3a9683..36c044f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,8 +7,6 @@ # dependencies used by the app pkg_dependencies="expect" -description="Secure Scuttlebutt room server implemented in Go" - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 74411c8..4a55c0f 100755 --- a/scripts/install +++ b/scripts/install @@ -160,7 +160,7 @@ ynh_use_logrotate #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="$description" --log="/var/log/$app/$app.log" --needs_exposed_ports $ssbport +yunohost service add $app --description="Secure Scuttlebutt room server" --log="/var/log/$app/$app.log" --needs_exposed_ports $ssbport #================================================= # START SYSTEMD SERVICE @@ -183,7 +183,6 @@ then ynh_permission_update --permission="main" --add="visitors" fi - #================================================= # RELOAD NGINX #================================================= diff --git a/scripts/restore b/scripts/restore index a661278..fcbc5b1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -120,7 +120,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="$description" --log="/var/log/$app/$app.log" --needs_exposed_ports $ssbport +yunohost service add $app --description="Secure Scuttlebutt room server" --log="/var/log/$app/$app.log" --needs_exposed_ports $ssbport #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index ac77223..6c2f453 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -132,7 +132,7 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="$description" --log="/var/log/$app/$app.log" --needs_exposed_ports $ssbport +yunohost service add $app --description="Secure Scuttlebutt room server" --log="/var/log/$app/$app.log" --needs_exposed_ports $ssbport #================================================= # START SYSTEMD SERVICE From ed26b55f68cc7cfa60b263ea8af9292e241458ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 17 Aug 2023 21:02:19 +0200 Subject: [PATCH 6/6] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 2736616..d297bf4 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_public=1 upgrade=1 # 2.0.6~ynh3 - upgrade=1 from_commit=c759c5f400660031676a0f92d5c5ffcc68bd6da9 + #upgrade=1 from_commit=c759c5f400660031676a0f92d5c5ffcc68bd6da9 backup_restore=1 multi_instance=1 port_already_use=0