[Astlinux-commits] SF.net SVN: astlinux:[6560] branches/1.0/package/zabbix/zabbix.init

[<abe...@us...>]

Revision: 6560
          http://sourceforge.net/p/astlinux/code/6560
Author:   abelbeck
Date:     2014-06-19 20:14:07 +0000 (Thu, 19 Jun 2014)
Log Message:
-----------
zabbix, automatically include file /mnt/kd/zabbix_proxy.general.conf if it exixts, to the proxy config

Modified Paths:
--------------
    branches/1.0/package/zabbix/zabbix.init

Modified: branches/1.0/package/zabbix/zabbix.init
===================================================================
--- branches/1.0/package/zabbix/zabbix.init	2014-06-19 19:26:15 UTC (rev 6559)
+++ branches/1.0/package/zabbix/zabbix.init	2014-06-19 20:14:07 UTC (rev 6560)
@@ -64,6 +64,11 @@
   proxyserver="$(echo $server | cut -d',' -f1)"  # Only use first server for proxy
   proxyhostname="${ZABBIX_PROXY_HOSTNAME:-proxy-$HOSTNAME}"
   proxylistenport="${ZABBIX_PROXY_LISTENPORT:-10051}"
+  if [ -f /mnt/kd/zabbix_proxy.general.conf ]; then
+    proxy_include="/mnt/kd/zabbix_proxy.general.conf"
+  else
+    proxy_include=""
+  fi
 
   if [ $proxy_enabled -eq 1 ]; then
 
@@ -83,7 +88,8 @@
 Timeout=$timeout
 DBName=/var/db/zabbix/zabbix_proxy.db
 PidFile=/var/run/zabbix_proxy.pid
-LogFile=/var/log/zabbix_proxy.log
+LogFile=/var/log/zabbix_proxy.log${proxy_include:+
+Include=$proxy_include}
 " >/tmp/etc/zabbix_proxy.conf
     fi
     chown zabbix:zabbix /tmp/etc/zabbix_proxy.conf

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.