diff --git a/manifest.json b/manifest.json index 79ff7ad..04cd064 100644 --- a/manifest.json +++ b/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": { diff --git a/scripts/backup b/scripts/backup index a5bd1ad..300cbbb 100644 --- a/scripts/backup +++ b/scripts/backup @@ -69,7 +69,4 @@ ynh_mysql_dump_db "$db_name" > db.sql #================================================= # SPECIFIC BACKUP #================================================= -# BACKUP LOGROTATE -#================================================= -ynh_backup "/etc/logrotate.d/$app" diff --git a/scripts/install b/scripts/install index d060113..f4cac42 100644 --- a/scripts/install +++ b/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 diff --git a/scripts/remove b/scripts/remove index cd95114..83a8bcd 100644 --- a/scripts/remove +++ b/scripts/remove @@ -131,4 +131,3 @@ ynh_secure_remove "/etc/sudoers.d/zabbix" # Delete a system user ynh_system_user_delete zabbix - diff --git a/scripts/restore b/scripts/restore index 4409c8a..2bc111d 100644 --- a/scripts/restore +++ b/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 diff --git a/scripts/upgrade b/scripts/upgrade index 2215534..02173a4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -258,4 +258,4 @@ else fi systemctl reload nginx -yunohost app ssowatconf \ No newline at end of file +yunohost app ssowatconf diff --git a/sources/extra_files/app/Template_Yunohost.xml b/sources/extra_files/app/Template_Yunohost.xml index 49d5bd1..ef98bcf 100644 --- a/sources/extra_files/app/Template_Yunohost.xml +++ b/sources/extra_files/app/Template_Yunohost.xml @@ -1410,4 +1410,4 @@ fi - \ No newline at end of file +