YunoHost-Apps/zabbix_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/zabbix_ynh.git synced 2024-09-03 20:36:14 +02:00
Code Issues Activity Actions

Merge branch 'testing' into 'RC2.0'

Browse source 
Testing

See merge request Mickael-Martin/zabbix_ynh!16
This commit is contained in:
Mickael-Martin 2019-03-26 09:17:39 +01:00
commit f9fa37c9f2
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/upgrade
View file

@ -52,6 +52,14 @@ fi
export mysqlconn="mysql -u$db_user -p$db_pwd $db_name" 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 # Enable default admin temporaly
#================================================= #=================================================

26
sources/extra_files/app/Template_Yunohost.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<zabbix_export> <zabbix_export>
<version>4.0</version> <version>4.0</version>
<date>2019-01-31T12:45:57Z</date> <date>2019-03-07T14:08:51Z</date>
<groups> <groups>
<group> <group>
<name>Templates/Applications</name> <name>Templates/Applications</name>
@ -12,7 +12,7 @@
<template>Template Yunohost</template> <template>Template Yunohost</template>
<name>Template Yunohost</name> <name>Template Yunohost</name>
<description>cat /etc/sudoers.d/zabbix &#13; <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; &#13;
cat /etc/zabbix/zabbix_agentd.d/userP_yunohost.conf &#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; 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.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.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.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.tcp.discover,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.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.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; UserParameter=yunohost.migrations.lastavailable,sudo /etc/zabbix/zabbix_agentd.d/yunohost.sh yunohost.migrations.lastavailable&#13;
&#13; &#13;
@ -130,7 +130,7 @@ fi</description>
<snmp_community/> <snmp_community/>
<snmp_oid/> <snmp_oid/>
<key>yunohost.backups.ageoflastbackup</key> <key>yunohost.backups.ageoflastbackup</key>
<delay>1d</delay> <delay>1d;h10m45</delay>
<history>90d</history> <history>90d</history>
<trends>365d</trends> <trends>365d</trends>
<status>0</status> <status>0</status>
@ -189,7 +189,7 @@ fi</description>
<snmp_community/> <snmp_community/>
<snmp_oid/> <snmp_oid/>
<key>yunohost.backups.number</key> <key>yunohost.backups.number</key>
<delay>1d</delay> <delay>1d;h11</delay>
<history>90d</history> <history>90d</history>
<trends>365d</trends> <trends>365d</trends>
<status>0</status> <status>0</status>
@ -248,7 +248,7 @@ fi</description>
<snmp_community/> <snmp_community/>
<snmp_oid/> <snmp_oid/>
<key>yunohost.migrations.lastavailable</key> <key>yunohost.migrations.lastavailable</key>
<delay>1d</delay> <delay>1d;h10m50</delay>
<history>90d</history> <history>90d</history>
<trends>365d</trends> <trends>365d</trends>
<status>0</status> <status>0</status>
@ -307,7 +307,7 @@ fi</description>
<snmp_community/> <snmp_community/>
<snmp_oid/> <snmp_oid/>
<key>yunohost.migrations.lastinstalled</key> <key>yunohost.migrations.lastinstalled</key>
<delay>1d</delay> <delay>1d;h10m55</delay>
<history>90d</history> <history>90d</history>
<trends>365d</trends> <trends>365d</trends>
<status>0</status> <status>0</status>
@ -368,7 +368,7 @@ fi</description>
<snmp_community/> <snmp_community/>
<snmp_oid/> <snmp_oid/>
<key>yunohost.domains.discover</key> <key>yunohost.domains.discover</key>
<delay>1d</delay> <delay>1d;h10</delay>
<status>0</status> <status>0</status>
<allowed_hosts/> <allowed_hosts/>
<snmpv3_contextname/> <snmpv3_contextname/>
@ -632,7 +632,7 @@ fi</description>
<snmp_community/> <snmp_community/>
<snmp_oid/> <snmp_oid/>
<key>yunohost.ports.tcp.discover</key> <key>yunohost.ports.tcp.discover</key>
<delay>1d</delay> <delay>1d;h9m30</delay>
<status>0</status> <status>0</status>
<allowed_hosts/> <allowed_hosts/>
<snmpv3_contextname/> <snmpv3_contextname/>
@ -766,7 +766,7 @@ fi</description>
<snmp_community/> <snmp_community/>
<snmp_oid/> <snmp_oid/>
<key>yunohost.ports.udp.discover</key> <key>yunohost.ports.udp.discover</key>
<delay>1d</delay> <delay>1d;h9m45</delay>
<status>0</status> <status>0</status>
<allowed_hosts/> <allowed_hosts/>
<snmpv3_contextname/> <snmpv3_contextname/>
@ -900,7 +900,7 @@ fi</description>
<snmp_community/> <snmp_community/>
<snmp_oid/> <snmp_oid/>
<key>yunohost.services.discover</key> <key>yunohost.services.discover</key>
<delay>1d</delay> <delay>1d;h10m15</delay>
<status>0</status> <status>0</status>
<allowed_hosts/> <allowed_hosts/>
<snmpv3_contextname/> <snmpv3_contextname/>
@ -1146,7 +1146,7 @@ fi</description>
<snmp_community/> <snmp_community/>
<snmp_oid/> <snmp_oid/>
<key>yunohost.users.discover</key> <key>yunohost.users.discover</key>
<delay>1d</delay> <delay>1d;h10m30</delay>
<status>0</status> <status>0</status>
<allowed_hosts/> <allowed_hosts/>
<snmpv3_contextname/> <snmpv3_contextname/>