Merge branch 'RC2.0' into 'testing'

update testing

See merge request Mickael-Martin/zabbix_ynh!14

manifest.json

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

scripts/backup

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

scripts/install

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

scripts/remove

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

scripts/restore

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

scripts/upgrade

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

sources/extra_files/app/Template_Yunohost.xml

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