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

Merge branch 'RC2.0' into 'testing'

update testing

See merge request Mickael-Martin/zabbix_ynh!14
This commit is contained in:
Mickael-Martin 2019-02-21 20:37:55 +01:00
commit 532ffbe4eb
7 changed files with 7 additions and 8 deletions

View file

@ -6,7 +6,7 @@
"en": "YunoHost port for Zabbix", "en": "YunoHost port for Zabbix",
"fr": "Zabbix pour Yunohost" "fr": "Zabbix pour Yunohost"
}, },
"version": "1.2", "version": "2.0",
"url": "https://framagit.org/Mickael-Martin/zabbix_ynh", "url": "https://framagit.org/Mickael-Martin/zabbix_ynh",
"license": "free", "license": "free",
"maintainer": { "maintainer": {

View file

@ -69,7 +69,4 @@ ynh_mysql_dump_db "$db_name" > db.sql
#================================================= #=================================================
# SPECIFIC BACKUP # SPECIFIC BACKUP
#================================================= #=================================================
# BACKUP LOGROTATE
#=================================================
ynh_backup "/etc/logrotate.d/$app"

View file

@ -262,6 +262,8 @@ ynh_add_fpm_config
# Set the app as temporarily public for curl call # Set the app as temporarily public for curl call
#ynh_app_setting_set $app skipped_uris "/" #ynh_app_setting_set $app skipped_uris "/"
# Reload SSOwat config
yunohost app ssowatconf
# Reload Nginx # Reload Nginx
systemctl reload nginx systemctl reload nginx

View file

@ -131,4 +131,3 @@ ynh_secure_remove "/etc/sudoers.d/zabbix"
# Delete a system user # Delete a system user
ynh_system_user_delete zabbix ynh_system_user_delete zabbix

View file

@ -151,7 +151,8 @@ systemctl enable zabbix-server && systemctl start zabbix-server
### - And the section "SETUP LOGROTATE" in the upgrade script ### - And the section "SETUP LOGROTATE" in the upgrade script
# Use logrotate to manage application logfile(s) # Use logrotate to manage application logfile(s)
ynh_use_logrotate #ynh_use_logrotate
#no need, use native logrotate in zabbix packages
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT

View file

@ -258,4 +258,4 @@ else
fi fi
systemctl reload nginx systemctl reload nginx
yunohost app ssowatconf yunohost app ssowatconf

View file

@ -1410,4 +1410,4 @@ fi</description>
</mappings> </mappings>
</value_map> </value_map>
</value_maps> </value_maps>
</zabbix_export> </zabbix_export>