浏览代码

Merge branch '1.2' into 'master'

1.2

See merge request Mickael-Martin/zabbix_ynh!11
Mickael-Martin 7 年之前
父节点
当前提交
026686ffc0
共有 2 个文件被更改,包括 6 次插入2 次删除
  1. 2 1
      scripts/install
  2. 4 1
      scripts/upgrade

+ 2 - 1
scripts/install

@@ -347,7 +347,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
+#native logrotate because install officials packages.
+#ynh_use_logrotate
 
 
 #=================================================
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
 # ADVERTISE SERVICE IN ADMIN PANEL

+ 4 - 1
scripts/upgrade

@@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 #=================================================
 
 
 app=$YNH_APP_INSTANCE_NAME
 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)
 domain=$(ynh_app_setting_get $app domain)
 path_url=$(ynh_app_setting_get $app path)
 path_url=$(ynh_app_setting_get $app path)
 admin=$(ynh_app_setting_get $app admin)
 admin=$(ynh_app_setting_get $app admin)
@@ -94,6 +94,9 @@ path_url=$(ynh_normalize_url_path $path_url)
 
 
 ynh_package_update
 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(.*)")
 zabbixServerInstalledVersion=$(apt-cache policy zabbix-server-mysql | grep -Po "Installed: \K(.*)")
 zabbixServerCandidateVersion=$(apt-cache policy zabbix-server-mysql | grep -Po "Candidate: \K(.*)")
 zabbixServerCandidateVersion=$(apt-cache policy zabbix-server-mysql | grep -Po "Candidate: \K(.*)")