From b64dfe8ce1b09e52f0d9b4bb7d40b840cc7090ba Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 29 Sep 2021 23:07:14 +0200 Subject: [PATCH 1/7] Fix upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index dcc96c6..b5eb671 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,7 +25,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) language=$(ynh_app_setting_get --app=$app --key=language) trustedversion="4.4-1+stretch" -if ynh_permission_has_user --permission=main --user=visitors +if [ ynh_permission_has_user --permission=main --user=visitors ] then is_public=0 else From 594bbf7eb8c08e1ea2d933f0b50f97b492fc16a4 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 30 Sep 2021 00:53:24 +0200 Subject: [PATCH 2/7] Typo --- doc/DISCLAIMER.md | 2 +- doc/DISCLAIMER_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index b5d97c0..a2cb871 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -5,4 +5,4 @@ * Do not change the default admin user password. The user is disabled just after the install but is used to update templates. * The Zabbix server port is not opened by default for external monitoring (active agent). * You can add your users in a group in Zabbix (for permissions/rights). -* A Yunohost template is imported and linked to the host "Zabbix-server" (127.0.0.1) for basic monitoring for YunoHost. +* A YunoHost template is imported and linked to the host "Zabbix-server" (127.0.0.1) for basic monitoring for YunoHost. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 7d58076..a8cc1d3 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -5,4 +5,4 @@ * Ne modifiez pas le mot de passe de l'utilisateur administrateur par défaut. L'utilisateur est désactivé juste après l'installation mais il est utilisé pour mettre à jour les modèles. * Le port du serveur Zabbix n'est pas ouvert par défaut pour la surveillance externe (agent actif). * Vous pouvez ajouter vos utilisateurs dans un groupe dans Zabbix (pour les autorisations/droits). -* Un modèle Yunohost est importé et lié à l'hôte "Zabbix-server" (127.0.0.1) pour la surveillance de base de YunoHost. \ No newline at end of file +* Un modèle YunoHost est importé et lié à l'hôte "Zabbix-server" (127.0.0.1) pour la surveillance de base de YunoHost. \ No newline at end of file From 5145a4654b10f050934a4752fc1838f660e50861 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 29 Sep 2021 22:53:29 +0000 Subject: [PATCH 3/7] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a2c0813..de0dc26 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Monitoring tool for diverse IT components, including networks, servers, VMs and * Do not change the default admin user password. The user is disabled just after the install but is used to update templates. * The Zabbix server port is not opened by default for external monitoring (active agent). * You can add your users in a group in Zabbix (for permissions/rights). -* A Yunohost template is imported and linked to the host "Zabbix-server" (127.0.0.1) for basic monitoring for YunoHost. +* A YunoHost template is imported and linked to the host "Zabbix-server" (127.0.0.1) for basic monitoring for YunoHost. ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 36be783..bbfa1ba 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Outil pour monitorer des réseaux, des serveurs, des VMs et autres services en l * Ne modifiez pas le mot de passe de l'utilisateur administrateur par défaut. L'utilisateur est désactivé juste après l'installation mais il est utilisé pour mettre à jour les modèles. * Le port du serveur Zabbix n'est pas ouvert par défaut pour la surveillance externe (agent actif). * Vous pouvez ajouter vos utilisateurs dans un groupe dans Zabbix (pour les autorisations/droits). -* Un modèle Yunohost est importé et lié à l'hôte "Zabbix-server" (127.0.0.1) pour la surveillance de base de YunoHost. +* Un modèle YunoHost est importé et lié à l'hôte "Zabbix-server" (127.0.0.1) pour la surveillance de base de YunoHost. ## Documentations et ressources * Site officiel de l'app : https://www.zabbix.com/ From 0500b5b614a49ef9913c23dc01899df24ea11cec Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 5 Oct 2021 20:00:57 +0200 Subject: [PATCH 4/7] Fix is_public during upgrade --- scripts/upgrade | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index b5eb671..4efdcdc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,12 +25,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) language=$(ynh_app_setting_get --app=$app --key=language) trustedversion="4.4-1+stretch" -if [ ynh_permission_has_user --permission=main --user=visitors ] -then - is_public=0 -else - is_public=1 -fi +is_public=$(ynh_permission_has_user --permission=main --user=visitors) #================================================= # CHECK VERSION From 2d976a5b79ee284ccc2f625fa9fc473e5289e1fa Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 5 Oct 2021 20:02:59 +0200 Subject: [PATCH 5/7] Upgrade requirements as https://github.com/YunoHost/yunohost/commit/f0590907c9e2eebe46d28146698387a33a8aea76 will be in 4.3.1.1 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d546843..1b81991 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "url": "http://www.librement-votre.fr" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.3.1.1" }, "multi_instance": false, "services": [ From 6981c87f0068a82b29373b5b51119f1f1df91a1d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 5 Oct 2021 21:44:35 +0200 Subject: [PATCH 6/7] Update scripts/upgrade Co-authored-by: Alexandre Aubin --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4efdcdc..0e96805 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,7 +25,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) language=$(ynh_app_setting_get --app=$app --key=language) trustedversion="4.4-1+stretch" -is_public=$(ynh_permission_has_user --permission=main --user=visitors) +is_public=$(ynh_permission_has_user --permission=main --user=visitors && echo 1 || echo 0) #================================================= # CHECK VERSION From 32caa8b008b4b30b8ca3f943cb423673617a7629 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 5 Oct 2021 21:45:53 +0200 Subject: [PATCH 7/7] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 1b81991..d546843 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "url": "http://www.librement-votre.fr" }, "requirements": { - "yunohost": ">= 4.3.1.1" + "yunohost": ">= 4.1.3" }, "multi_instance": false, "services": [