Przeglądaj źródła

Merge branch 'clean-unistall' into 'master'

Clean unistall

See merge request Mickael-Martin/zabbix_ynh!32
Mickael-Martin 6 lat temu
rodzic
commit
17d55949c4
3 zmienionych plików z 10 dodań i 2 usunięć
  1. 2 2
      manifest.json
  2. 6 0
      scripts/_common.sh
  3. 2 0
      scripts/remove

+ 2 - 2
manifest.json

@@ -6,7 +6,7 @@
         "en": "A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.",
         "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"
         "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",
     "url": "https://www.zabbix.com",
     "license": "free",
     "license": "free",
     "maintainer": {
     "maintainer": {
@@ -15,7 +15,7 @@
         "url": "http://www.librement-votre.fr"
         "url": "http://www.librement-votre.fr"
     },
     },
     "requirements": {
     "requirements": {
-        "yunohost": ">= 3.4.2"
+        "yunohost": ">= 3.6.5"
     },
     },
     "multi_instance": false,
     "multi_instance": false,
     "services": [
     "services": [

+ 6 - 0
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)
     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"
     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
     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
 }
 }

+ 2 - 0
scripts/remove

@@ -95,6 +95,8 @@ fi
 # REMOVE THE CRON FILE
 # REMOVE THE CRON FILE
 #=================================================
 #=================================================
 
 
+remove_zabbix_repo
+
 #remove symlink
 #remove symlink
 rm /var/www/zabbix
 rm /var/www/zabbix