From 6f24d0a9cbe3fc5785cd7bdef397dd65673af613 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 27 Oct 2021 10:35:54 +0200 Subject: [PATCH 1/5] Fix /etc/sudoers.d/zabbix perms ... --- scripts/_common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index d472c23..e623d03 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -98,6 +98,7 @@ import_template () { bashUserPpath="../conf/etc_zabbix_zabbix_agentd.d_yunohost.sh" cp "$sudoUserPpath" /etc/sudoers.d/zabbix + chmod 400 /etc/sudoers.d/zabbix if [ -d /etc/zabbix/zabbix_agentd.d ] then From 6590f551effdda8796933b85cc116cf979b296d7 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 27 Oct 2021 10:37:52 +0200 Subject: [PATCH 2/5] Bump manifest version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d546843..28ac8b3 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Monitoring tool for diverse IT components, including networks, servers, VMs and cloud services", "fr": "Outil pour monitorer des réseaux, des serveurs, des VMs et autres services en ligne" }, - "version": "4.4~ynh2", + "version": "4.4~ynh3", "url": "https://www.zabbix.com", "upstream": { "license": "GPL-2.0-or-later", From ea947928afdc22ee66981685cab39f98be5f52b1 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 27 Oct 2021 08:37:56 +0000 Subject: [PATCH 3/5] 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 de0dc26..94354f7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Monitoring tool for diverse IT components, including networks, servers, VMs and cloud services -**Shipped version:** 4.4~ynh2 +**Shipped version:** 4.4~ynh3 diff --git a/README_fr.md b/README_fr.md index bbfa1ba..8ee709e 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 Outil pour monitorer des réseaux, des serveurs, des VMs et autres services en ligne -**Version incluse :** 4.4~ynh2 +**Version incluse :** 4.4~ynh3 From e4134af0e7880bc8cd6537061fed95ee6a91f45b Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 27 Oct 2021 18:24:03 +0200 Subject: [PATCH 4/5] Superflous example values for domain and admin --- manifest.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 28ac8b3..7e25226 100644 --- a/manifest.json +++ b/manifest.json @@ -33,8 +33,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", @@ -44,8 +43,7 @@ }, { "name": "admin", - "type": "user", - "example": "mickael" + "type": "user" }, { "name": "is_public", From 8a826ccebd5965887d0f0de5227e74a8b35df3bf Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 27 Oct 2021 18:24:45 +0200 Subject: [PATCH 5/5] Pointless ynh_webpath_available call in restore --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index f72f47e..cdcbd0a 100644 --- a/scripts/restore +++ b/scripts/restore @@ -42,8 +42,6 @@ ynh_script_progression --message="Validating restoration parameters..." remove_previous_zabbix -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path "