From be102343e104cf32a9f3692ae289b5126a4ec05f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20W=C3=BChr?= Date: Thu, 12 Oct 2023 11:11:27 +0200 Subject: [PATCH 1/7] Enable auto updates (#27) * Switch to manifest src handling (#26) * Update pkg to 2.7.0~ynh2 * Auto-update README --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/amd64.src | 6 ------ conf/arm64.src | 6 ------ conf/armhf.src | 6 ------ manifest.toml | 19 ++++++++++++++++++- scripts/_common.sh | 2 +- tools/update_src.sh | 20 -------------------- 8 files changed, 21 insertions(+), 42 deletions(-) delete mode 100644 conf/amd64.src delete mode 100644 conf/arm64.src delete mode 100644 conf/armhf.src delete mode 100644 tools/update_src.sh diff --git a/README.md b/README.md index 8a1fa04..3a3fe73 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ntfy (pronounce: *notify*) is a simple HTTP-based pub-sub notification service. It allows you to send notifications to your phone or desktop via scripts from any computer, entirely without signup, cost or setup. It's also open source if you want to run your own. -**Shipped version:** 2.7.0~ynh1 +**Shipped version:** 2.7.0~ynh2 **Demo:** https://ntfy.sh/app ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 7f24b0a..d405e8b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ntfy (pronounce: *notify*) is a simple HTTP-based pub-sub notification service. It allows you to send notifications to your phone or desktop via scripts from any computer, entirely without signup, cost or setup. It's also open source if you want to run your own. -**Version incluse :** 2.7.0~ynh1 +**Version incluse :** 2.7.0~ynh2 **Démo :** https://ntfy.sh/app ## Documentations et ressources diff --git a/conf/amd64.src b/conf/amd64.src deleted file mode 100644 index 9a815e5..0000000 --- a/conf/amd64.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_amd64.tar.gz -SOURCE_SUM=2218bea3204348700034cff652437e317b8ed2466aa58d8b2444b41b68eaf5e2 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=ntfy_2.7.0_linux_amd64 diff --git a/conf/arm64.src b/conf/arm64.src deleted file mode 100644 index ea734ee..0000000 --- a/conf/arm64.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_arm64.tar.gz -SOURCE_SUM=1e0e1bc4183e3ffecbe8d8b1b91b5df8965d907968588c19b7a591719bd146fb -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=ntfy_2.7.0_linux_arm64 diff --git a/conf/armhf.src b/conf/armhf.src deleted file mode 100644 index 385e297..0000000 --- a/conf/armhf.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_armv7.tar.gz -SOURCE_SUM=84981fe6f4234fb8e6429b0c6cbe7090bab1f773e1994b42237c40c244cdd326 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=ntfy_2.7.0_linux_armv7 diff --git a/manifest.toml b/manifest.toml index 83125fb..fd0c271 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "ntfy" description.en = "Open Source Push Notification Server" description.fr = "Serveur open source de notification" -version = "2.7.0~ynh1" +version = "2.7.0~ynh2" maintainers = ["Alexander Wühr"] @@ -43,6 +43,23 @@ ram.runtime = "50M" type = "password" [resources] + [resources.sources] + [resources.sources.main] + autoupdate.strategy = "latest_github_release" + + autoupdate.asset.amd64 = '.*_linux_amd64\.tar\.gz' + autoupdate.asset.arm64 = '.*_linux_arm64\.tar\.gz' + autoupdate.asset.armhf = '.*_linux_armv7\.tar\.gz' + + amd64.url = "https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_amd64.tar.gz" + amd64.sha256 = "2218bea3204348700034cff652437e317b8ed2466aa58d8b2444b41b68eaf5e2" + + arm64.url = "https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_arm64.tar.gz" + arm64.sha256 = "1e0e1bc4183e3ffecbe8d8b1b91b5df8965d907968588c19b7a591719bd146fb" + + armhf.url = "https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_armv7.tar.gz" + armhf.sha256 ="84981fe6f4234fb8e6429b0c6cbe7090bab1f773e1994b42237c40c244cdd326" + [resources.system_user] [resources.install_dir] diff --git a/scripts/_common.sh b/scripts/_common.sh index 3d358ff..d5f34cb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ #================================================= ntfy_setup_source() { - ynh_setup_source -d "$install_dir" -s "$YNH_ARCH" + ynh_setup_source -d "$install_dir" mkdir -p "$install_dir/data" chown -R $app:$app "$install_dir" chmod -R 750 "$install_dir/data" diff --git a/tools/update_src.sh b/tools/update_src.sh deleted file mode 100644 index f123c9a..0000000 --- a/tools/update_src.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -VERSION=$1 - -CHECKSUMS=`wget https://github.com/binwiederhier/ntfy/releases/download/v$VERSION/checksums.txt -q -O -` - -src() { - cat << SH > conf/$1.src -SOURCE_URL=https://github.com/binwiederhier/ntfy/releases/download/v${VERSION}/ntfy_${VERSION}_linux_${2}.tar.gz -SOURCE_SUM=`echo "$CHECKSUMS" | grep ${VERSION}_linux_${2}.tar.gz | cut -d " " -f 1` -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=ntfy_${VERSION}_linux_${2} -SH -} - -src amd64 amd64 -src arm64 arm64 -src armhf armv7 From 145a70c5bc126c8e235dfe72bb3657f22246cb78 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 12 Oct 2023 09:11:32 +0000 Subject: [PATCH 2/7] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 3a3fe73..3e40cc8 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,6 @@ ntfy (pronounce: *notify*) is a simple HTTP-based pub-sub notification service. * Official user documentation: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index d405e8b..4ef2877 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,6 @@ ntfy (pronounce: *notify*) is a simple HTTP-based pub-sub notification service. * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From 0647ea45ef96ca0b106df09b6fe4760fe02e845d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 31 Oct 2023 14:25:47 +0000 Subject: [PATCH 3/7] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 3e40cc8..04561a2 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ ntfy (pronounce: *notify*) is a simple HTTP-based pub-sub notification service. * Official user documentation: * Official admin documentation: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 4ef2877..6c6fafc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,6 +28,7 @@ ntfy (pronounce: *notify*) is a simple HTTP-based pub-sub notification service. * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 4213dfcbe24a739826f4325145d9b15fa814374a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 23 Nov 2023 19:25:17 +0100 Subject: [PATCH 4/7] Update manifest.toml --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index fd0c271..1a03369 100644 --- a/manifest.toml +++ b/manifest.toml @@ -22,8 +22,11 @@ fund = "https://liberapay.com/ntfy" yunohost = ">= 11.2" architectures = ["amd64", "arm64", "armhf"] multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" From 5831c62c8a7ff934c72aae6fe17d0dc1a63ed7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 23 Nov 2023 19:25:59 +0100 Subject: [PATCH 5/7] Create DESCRIPTION_fr.md --- doc/DESCRIPTION_fr.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..d4ea610 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +ntfy (prononcer : *notify*) est un simple service de notification pub-sub basé sur HTTP. Il vous permet d'envoyer des notifications sur votre téléphone ou votre ordinateur via des scripts depuis n'importe quel ordinateur, sans inscription, sans frais ni configuration. Il est également open source si vous souhaitez exécuter le vôtre. \ No newline at end of file From 93f56c912713067631a9517a179ef2c1586f3236 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 23 Nov 2023 18:26:04 +0000 Subject: [PATCH 6/7] Auto-update README --- README_fr.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README_fr.md b/README_fr.md index 6c6fafc..bae11b9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,8 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -ntfy (pronounce: *notify*) is a simple HTTP-based pub-sub notification service. It allows you to send notifications to your phone or desktop via scripts from any computer, entirely without signup, cost or setup. It's also open source if you want to run your own. - +ntfy (prononcer : *notify*) est un simple service de notification pub-sub basé sur HTTP. Il vous permet d'envoyer des notifications sur votre téléphone ou votre ordinateur via des scripts depuis n'importe quel ordinateur, sans inscription, sans frais ni configuration. Il est également open source si vous souhaitez exécuter le vôtre. **Version incluse :** 2.7.0~ynh2 From cdf51f8e24bb9c2ddc7a454b5651b88525abbe0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 23 Nov 2023 19:27:05 +0100 Subject: [PATCH 7/7] cleaning --- doc/admin.md | 1 + doc/admin_fr.md | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 doc/admin_fr.md diff --git a/doc/admin.md b/doc/admin.md index e5b2b12..7128e6b 100644 --- a/doc/admin.md +++ b/doc/admin.md @@ -1,4 +1,5 @@ ### Configuration + By default, only user selected at installation can read from and write to topics. To change this refer to the upstream project's documentation: https://docs.ntfy.sh/config/#access-control The configuration file is located at `__INSTALL_DIR__/server.yml` and can be edited directly. diff --git a/doc/admin_fr.md b/doc/admin_fr.md new file mode 100644 index 0000000..5d64f61 --- /dev/null +++ b/doc/admin_fr.md @@ -0,0 +1,13 @@ +### Configuration + +Par défaut, seul l'utilisateur sélectionné lors de l'installation peut lire et écrire dans les rubriques. Pour modifier cela, reportez-vous à la documentation du projet : https://docs.ntfy.sh/config/#access-control + +Le fichier de configuration se trouve dans `__INSTALL_DIR__/server.yml` et peut être modifié directement. + +Pour configurer les utilisateurs, les jetons, les acls et les niveaux, vous trouverez un petit script wrapper dans `__INSTALL_DIR__/ntfy.sh`. + +``` merde +sudo ~__APP__/ntfy.sh utilisateur ajoutez votre_nouveau_nom d'utilisateur +``` + +par exemple, ajoutera un nouvel utilisateur. \ No newline at end of file