From 066ec6881a89355ad2375aa76bdc106469015047 Mon Sep 17 00:00:00 2001 From: Mickael-Martin Date: Tue, 5 Feb 2019 13:49:20 +0100 Subject: [PATCH 1/4] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index ab2d3a8..4b14181 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers #================================================= app=$YNH_APP_INSTANCE_NAME -trustedversion="4.0.3-1+stretch" +trustedversion="1:4.0.4-1+stretch" domain=$(ynh_app_setting_get $app domain) path_url=$(ynh_app_setting_get $app path) admin=$(ynh_app_setting_get $app admin) From 369402602435aaea82a9d581f5d8fb70f6fdb1bd Mon Sep 17 00:00:00 2001 From: Mickael-Martin Date: Thu, 14 Feb 2019 11:09:28 +0100 Subject: [PATCH 2/4] Update install --- scripts/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index c57b44e..21525bc 100644 --- a/scripts/install +++ b/scripts/install @@ -347,7 +347,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 +#native logrotate because install officials packages. +#ynh_use_logrotate #================================================= # ADVERTISE SERVICE IN ADMIN PANEL From b1d8fda4c8e48c7c3d58e55b94bd645620b5560c Mon Sep 17 00:00:00 2001 From: Mickael-Martin Date: Thu, 14 Feb 2019 11:18:20 +0100 Subject: [PATCH 3/4] Update install (logrotate) --- scripts/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index c57b44e..069c38f 100644 --- a/scripts/install +++ b/scripts/install @@ -347,7 +347,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 +# no logrotate needed : officials packages include logrotate +# ynh_use_logrotate #================================================= # ADVERTISE SERVICE IN ADMIN PANEL From cd78326b99cd88f38334b1d0f8a9050b0f9cc01a Mon Sep 17 00:00:00 2001 From: Mickael-Martin Date: Thu, 14 Feb 2019 11:19:02 +0100 Subject: [PATCH 4/4] Update upgrade (logrotate) --- scripts/upgrade | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 4b14181..7c1cce4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,6 +94,9 @@ path_url=$(ynh_normalize_url_path $path_url) ynh_package_update +#REMOVE DUPLICATE LOG ENTRY IN LOGROTATE PATCH IF NEEDED +ynh_remove_logrotate + zabbixServerInstalledVersion=$(apt-cache policy zabbix-server-mysql | grep -Po "Installed: \K(.*)") zabbixServerCandidateVersion=$(apt-cache policy zabbix-server-mysql | grep -Po "Candidate: \K(.*)")