From 2e4e51ec214a0f9e13bafd44c787fb122ffb170c Mon Sep 17 00:00:00 2001
From: Mickael-Martin <framagit@librement-votre.fr>
Date: Tue, 26 Mar 2019 09:17:39 +0100
Subject: [PATCH] Merge branch 'master' into 'testing'

Master

See merge request Mickael-Martin/zabbix_ynh!12
---
 scripts/upgrade                               |  8 ++++++
 sources/extra_files/app/Template_Yunohost.xml | 28 +++++++++----------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 666b60a..e7e0cab 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -52,6 +52,14 @@ fi
 
 export mysqlconn="mysql -u$db_user -p$db_pwd $db_name"
 
+#=================================================
+# DISABLED SSOWAT
+#=================================================
+ynh_print_info "disable SSOWAT temporaly"
+ynh_app_setting_set "$app" unprotected_uris "/"
+systemctl reload nginx
+yunohost app ssowatconf
+
 #=================================================
 # Enable default admin temporaly
 #=================================================
diff --git a/sources/extra_files/app/Template_Yunohost.xml b/sources/extra_files/app/Template_Yunohost.xml
index ef98bcf..ddd4f30 100644
--- a/sources/extra_files/app/Template_Yunohost.xml
+++ b/sources/extra_files/app/Template_Yunohost.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>4.0</version>
-    <date>2019-01-31T12:45:57Z</date>
+    <date>2019-03-07T14:08:51Z</date>
     <groups>
         <group>
             <name>Templates/Applications</name>
@@ -12,7 +12,7 @@
             <template>Template Yunohost</template>
             <name>Template Yunohost</name>
             <description>cat /etc/sudoers.d/zabbix &#13;
-zabbix    ALL=(root) NOPASSWD: /etc/zabbix/zabbix_agentd.d/yunohost.sh&#13;
+zabbix    ALL=(ALL) NOPASSWD: /etc/zabbix/zabbix_agentd.d/yunohost.sh&#13;
 &#13;
 cat /etc/zabbix/zabbix_agentd.d/userP_yunohost.conf &#13;
 UserParameter=yunohost.users.discover,sudo /etc/zabbix/zabbix_agentd.d/yunohost.sh yunohost.users.discover&#13;
@@ -23,8 +23,8 @@ UserParameter=yunohost.services.discover,sudo /etc/zabbix/zabbix_agentd.d/yunoho
 UserParameter=yunohost.service.status[*],sudo /etc/zabbix/zabbix_agentd.d/yunohost.sh yunohost.service.status &quot;$1&quot;&#13;
 UserParameter=yunohost.backups.number,sudo /etc/zabbix/zabbix_agentd.d/yunohost.sh yunohost.backups.number&#13;
 UserParameter=yunohost.backups.ageoflastbackup,sudo /etc/zabbix/zabbix_agentd.d/yunohost.sh yunohost.backups.ageoflastbackup&#13;
-UserParameter=yunohost.ports.tcp.discovery,sudo /etc/zabbix/zabbix_agentd.d/yunohost.sh yunohost.ports.tcp.discovery&#13;
-UserParameter=yunohost.ports.udp.discovery,sudo /etc/zabbix/zabbix_agentd.d/yunohost.sh yunohost.ports.udp.discovery&#13;
+UserParameter=yunohost.ports.tcp.discover,sudo /etc/zabbix/zabbix_agentd.d/yunohost.sh yunohost.ports.tcp.discovery&#13;
+UserParameter=yunohost.ports.udp.discover,sudo /etc/zabbix/zabbix_agentd.d/yunohost.sh yunohost.ports.udp.discovery&#13;
 UserParameter=yunohost.migrations.lastinstalled,sudo /etc/zabbix/zabbix_agentd.d/yunohost.sh yunohost.migrations.lastinstalled&#13;
 UserParameter=yunohost.migrations.lastavailable,sudo /etc/zabbix/zabbix_agentd.d/yunohost.sh yunohost.migrations.lastavailable&#13;
 &#13;
@@ -130,7 +130,7 @@ fi</description>
                     <snmp_community/>
                     <snmp_oid/>
                     <key>yunohost.backups.ageoflastbackup</key>
-                    <delay>1d</delay>
+                    <delay>1d;h10m45</delay>
                     <history>90d</history>
                     <trends>365d</trends>
                     <status>0</status>
@@ -189,7 +189,7 @@ fi</description>
                     <snmp_community/>
                     <snmp_oid/>
                     <key>yunohost.backups.number</key>
-                    <delay>1d</delay>
+                    <delay>1d;h11</delay>
                     <history>90d</history>
                     <trends>365d</trends>
                     <status>0</status>
@@ -248,7 +248,7 @@ fi</description>
                     <snmp_community/>
                     <snmp_oid/>
                     <key>yunohost.migrations.lastavailable</key>
-                    <delay>1d</delay>
+                    <delay>1d;h10m50</delay>
                     <history>90d</history>
                     <trends>365d</trends>
                     <status>0</status>
@@ -307,7 +307,7 @@ fi</description>
                     <snmp_community/>
                     <snmp_oid/>
                     <key>yunohost.migrations.lastinstalled</key>
-                    <delay>1d</delay>
+                    <delay>1d;h10m55</delay>
                     <history>90d</history>
                     <trends>365d</trends>
                     <status>0</status>
@@ -368,7 +368,7 @@ fi</description>
                     <snmp_community/>
                     <snmp_oid/>
                     <key>yunohost.domains.discover</key>
-                    <delay>1d</delay>
+                    <delay>1d;h10</delay>
                     <status>0</status>
                     <allowed_hosts/>
                     <snmpv3_contextname/>
@@ -632,7 +632,7 @@ fi</description>
                     <snmp_community/>
                     <snmp_oid/>
                     <key>yunohost.ports.tcp.discover</key>
-                    <delay>1d</delay>
+                    <delay>1d;h9m30</delay>
                     <status>0</status>
                     <allowed_hosts/>
                     <snmpv3_contextname/>
@@ -766,7 +766,7 @@ fi</description>
                     <snmp_community/>
                     <snmp_oid/>
                     <key>yunohost.ports.udp.discover</key>
-                    <delay>1d</delay>
+                    <delay>1d;h9m45</delay>
                     <status>0</status>
                     <allowed_hosts/>
                     <snmpv3_contextname/>
@@ -900,7 +900,7 @@ fi</description>
                     <snmp_community/>
                     <snmp_oid/>
                     <key>yunohost.services.discover</key>
-                    <delay>1d</delay>
+                    <delay>1d;h10m15</delay>
                     <status>0</status>
                     <allowed_hosts/>
                     <snmpv3_contextname/>
@@ -1146,7 +1146,7 @@ fi</description>
                     <snmp_community/>
                     <snmp_oid/>
                     <key>yunohost.users.discover</key>
-                    <delay>1d</delay>
+                    <delay>1d;h10m30</delay>
                     <status>0</status>
                     <allowed_hosts/>
                     <snmpv3_contextname/>
@@ -1410,4 +1410,4 @@ fi</description>
             </mappings>
         </value_map>
     </value_maps>
-</zabbix_export>
+</zabbix_export>
\ No newline at end of file