astlinux-commits

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

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

Revision: 5229
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5229&view=rev
Author:   abelbeck
Date:     2011-10-23 15:05:20 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
zabbix, allow the existance of /mnt/kd/zabbix_agentd.conf also enable zabbix

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

Modified: branches/1.0/package/zabbix/zabbix.init
===================================================================
--- branches/1.0/package/zabbix/zabbix.init	2011-10-23 14:23:01 UTC (rev 5228)
+++ branches/1.0/package/zabbix/zabbix.init	2011-10-23 15:05:20 UTC (rev 5229)
@@ -5,7 +5,7 @@
 init () {
   local server="" IFS
 
-  if [ -z "$ZABBIX_SERVER" ]; then
+  if [ -z "$ZABBIX_SERVER" ] && [ ! -f /mnt/kd/zabbix_agentd.conf ]; then
     if [ -f /tmp/etc/zabbix_agentd.conf ]; then
       rm /tmp/etc/zabbix_agentd.conf
     fi

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

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

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

Revision: 5702
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5702&view=rev
Author:   abelbeck
Date:     2012-10-04 20:58:24 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
zabbix, add support for zabbix_agentd Include= if the file /mnt/kd/zabbix_agentd.userparams.conf exists

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

Modified: branches/1.0/package/zabbix/zabbix.init
===================================================================
--- branches/1.0/package/zabbix/zabbix.init	2012-10-04 18:59:50 UTC (rev 5701)
+++ branches/1.0/package/zabbix/zabbix.init	2012-10-04 20:58:24 UTC (rev 5702)
@@ -56,6 +56,11 @@
   startagents="${ZABBIX_STARTAGENTS:-3}"
   debuglevel="${ZABBIX_DEBUGLEVEL:-3}"
   timeout="${ZABBIX_TIMEOUT:-3}"
+  if [ -f /mnt/kd/zabbix_agentd.userparams.conf ]; then
+    agentd_include="/mnt/kd/zabbix_agentd.userparams.conf"
+  else
+    agentd_include=""
+  fi
   proxyserver="$(echo $server | cut -d',' -f1)"  # Only use first server for proxy
   proxyhostname="${ZABBIX_PROXY_HOSTNAME:-proxy-$HOSTNAME}"
   proxylistenport="${ZABBIX_PROXY_LISTENPORT:-10051}"
@@ -118,7 +123,8 @@
 DebugLevel=$debuglevel
 Timeout=$timeout
 PidFile=/var/run/zabbix_agentd.pid
-LogFile=/var/log/zabbix_agentd.log
+LogFile=/var/log/zabbix_agentd.log${agentd_include:+
+Include=$agentd_include}
 AllowRoot=0
 " >/tmp/etc/zabbix_agentd.conf
   fi

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

[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.

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

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

Revision: 6565
          http://sourceforge.net/p/astlinux/code/6565
Author:   abelbeck
Date:     2014-06-23 15:30:16 +0000 (Mon, 23 Jun 2014)
Log Message:
-----------
zabbix, add a wait for zabbix_proxy to startup

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-23 15:16:29 UTC (rev 6564)
+++ branches/1.0/package/zabbix/zabbix.init	2014-06-23 15:30:16 UTC (rev 6565)
@@ -149,6 +149,9 @@
     chown zabbix:zabbix /var/run/zabbix_proxy.pid
 
     zabbix_proxy -c /etc/zabbix_proxy.conf
+
+    # Wait for zabbix_proxy to startup
+    sleep 1
   fi
 
   if [ -f /etc/zabbix_agentd.conf ]; then

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