浏览代码

Merge branch '1.2.1' into '1.2'

1.2.1

See merge request Mickael-Martin/zabbix_ynh!10
Mickael-Martin 7 年之前
父节点
当前提交
3ec44ba4f8
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 2 1
      scripts/install
  2. 3 0
      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

+ 3 - 0
scripts/upgrade

@@ -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(.*)")