[Astlinux-commits] SF.net SVN: astlinux:[5657] branches/1.0

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

Revision: 5657
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5657&view=rev
Author:   abelbeck
Date:     2012-09-03 02:50:27 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
zabbix, add ZABBIX_PROXY_LISTENPORT variable to allow configuration with stunnel

Modified Paths:
--------------
    branches/1.0/package/zabbix/zabbix.init
    branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf

Modified: branches/1.0/package/zabbix/zabbix.init
===================================================================
--- branches/1.0/package/zabbix/zabbix.init	2012-09-02 00:30:32 UTC (rev 5656)
+++ branches/1.0/package/zabbix/zabbix.init	2012-09-03 02:50:27 UTC (rev 5657)
@@ -58,7 +58,7 @@
   timeout="${ZABBIX_TIMEOUT:-3}"
   proxyserver="$(echo $server | cut -d',' -f1)"  # Only use first server for proxy
   proxyhostname="${ZABBIX_PROXY_HOSTNAME:-proxy-$HOSTNAME}"
-  proxylistenport="$serverport"
+  proxylistenport="${ZABBIX_PROXY_LISTENPORT:-10051}"
 
   if [ $proxy_enabled -eq 1 ]; then
 

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2012-09-02 00:30:32 UTC (rev 5656)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2012-09-03 02:50:27 UTC (rev 5657)
@@ -916,16 +916,17 @@
 
 ## Zabbix Agent Daemon
 ## Zabbix is enabled if ZABBIX_SERVER is defined.
-#ZABBIX_SERVER=""               # Comma/space separated list of IP addresses or hostnames for zabbix servers
-#ZABBIX_SERVER_PORT="10051"     # TCP port used for retrieving/sending active check data
-#ZABBIX_HOSTNAME=""             # Unique, case sensitive hostname, required for active checks
-#ZABBIX_LISTENPORT="10050"      # TCP port that zabbix_agentd listens on locally
-#ZABBIX_STARTAGENTS="3"         # Number of pre-forked instances of zabbix_agentd, must be between 1-16
-#ZABBIX_DEBUGLEVEL="3"          # "0" is no debug, "1" is critical, "2" is errors, "3" is warnings, "4" is full debugging
-#ZABBIX_TIMEOUT="3"             # Processing limit in seconds, must be between 1-30
-#ZABBIX_PROXY="yes"             # "yes" is to enable proxy, disabled by default
-#ZABBIX_PROXY_AGENT="no"        # By default the zabbix_agentd is routed via the proxy if enabled, set to "no" to disable
-#ZABBIX_PROXY_HOSTNAME=""       # Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server.
+#ZABBIX_SERVER=""                 # Comma/space separated list of IP addresses or hostnames for zabbix servers
+#ZABBIX_SERVER_PORT="10051"       # TCP port used for retrieving/sending active check data
+#ZABBIX_HOSTNAME=""               # Unique, case sensitive hostname, required for active checks
+#ZABBIX_LISTENPORT="10050"        # TCP port that zabbix_agentd listens on locally
+#ZABBIX_STARTAGENTS="3"           # Number of pre-forked instances of zabbix_agentd, must be between 1-16
+#ZABBIX_DEBUGLEVEL="3"            # "0" is no debug, "1" is critical, "2" is errors, "3" is warnings, "4" is full debugging
+#ZABBIX_TIMEOUT="3"               # Processing limit in seconds, must be between 1-30
+#ZABBIX_PROXY="yes"               # "yes" is to enable proxy, disabled by default
+#ZABBIX_PROXY_AGENT="no"          # By default the zabbix_agentd is routed via the proxy if enabled, set to "no" to disable
+#ZABBIX_PROXY_HOSTNAME=""         # Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server.
+#ZABBIX_PROXY_LISTENPORT="10051"  # TCP port that zabbix_proxy listens on locally
 
 ## NFS Server support (read only exports)
 #NFS_EXPORTS_RO="/tftpboot"

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