From 73c78a9c994146b638a5016da85421eea3fe342e Mon Sep 17 00:00:00 2001 From: Mickael-Martin Date: Mon, 25 Nov 2019 13:55:02 +0100 Subject: [PATCH 1/3] add remove_zabbix_repo --- scripts/_common.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 37c9763..44276f0 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -172,4 +172,10 @@ install_zabbix_repo(){ ynh_add_extra_apt_repos__3_path=$(find /var/cache/yunohost/ /etc/yunohost/apps/zabbix/ -name "ynh_add_extra_apt_repos__3" | tail -n 1) source "$ynh_add_extra_apt_repos__3_path" ynh_install_extra_repo --repo="http://repo.zabbix.com/zabbix/4.4/debian $(lsb_release -sc) main" --key=https://repo.zabbix.com/zabbix-official-repo.key --priority=999 --name=zabbix +} + +remove_zabbix_repo(){ + ynh_add_extra_apt_repos__3_path=$(find /var/cache/yunohost/ /etc/yunohost/apps/zabbix/ -name "ynh_add_extra_apt_repos__3" | tail -n 1) + source "$ynh_add_extra_apt_repos__3_path" + ynh_remove_extra_repo --name=zabbix } \ No newline at end of file From 276af2fec75f9bbb9bafc9c088dd506c1558fe38 Mon Sep 17 00:00:00 2001 From: Mickael-Martin Date: Mon, 25 Nov 2019 13:55:41 +0100 Subject: [PATCH 2/3] add remove_zabbix_repo --- scripts/remove | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/remove b/scripts/remove index d66e7de..9f5ea71 100644 --- a/scripts/remove +++ b/scripts/remove @@ -95,6 +95,8 @@ fi # REMOVE THE CRON FILE #================================================= +remove_zabbix_repo + #remove symlink rm /var/www/zabbix From d4c988a3c6066cd4cc494b68ec042358556f5185 Mon Sep 17 00:00:00 2001 From: Mickael-Martin Date: Tue, 26 Nov 2019 13:33:17 +0100 Subject: [PATCH 3/3] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 86653dd..aa859f1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.", "fr": "Un outil pour monitorer des réseaux, des serveurs, des VMs et autres services en ligne" }, - "version": "3.0", + "version": "3.1", "url": "https://www.zabbix.com", "license": "free", "maintainer": { @@ -15,7 +15,7 @@ "url": "http://www.librement-votre.fr" }, "requirements": { - "yunohost": ">= 3.4.2" + "yunohost": ">= 3.6.5" }, "multi_instance": false, "services": [