Merge pull request #29 from YunoHost-Apps/testing

Fix /etc/sudoers.d/zabbix perms ...

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
 
 
 

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
 
 
 

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",
@@ -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",

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

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 "