From 518dd7265774dd2d084966d9f10b60bb58b4d360 Mon Sep 17 00:00:00 2001
From: William Murphy <warrendiogenese@gmail.com>
Date: Thu, 7 Aug 2014 22:30:59 -0700
Subject: [PATCH 1/3] Patched alwaysmultiservers

---
 client/xymonclient.cfg.DIST          | 4 ++--
 xymond/etcfiles/xymonserver.cfg.DIST | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/xymonclient.cfg.DIST b/client/xymonclient.cfg.DIST
index b361fbc..134a22d 100644
--- a/client/xymonclient.cfg.DIST
+++ b/client/xymonclient.cfg.DIST
@@ -1,7 +1,7 @@
 # Environment settings for the Xymon client.
 
-XYMSRV="@XYMONHOSTIP@"          # IP address of the Xymon server
-XYMSERVERS=""                   # IP of multiple Xymon servers. XYMSRV must be "0.0.0.0".
+XYMSRV="0.0.0.0"          # IP address of the Xymon server
+XYMSERVERS="$XYMONSERVERS"   # IP of multiple Xymon servers. XYMSRV must be "0.0.0.0".
 CONFIGCLASS="$SERVEROSTYPE"     # Default configuration class for logfiles
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin:/etc"  # PATH setting for the client scripts.
diff --git a/xymond/etcfiles/xymonserver.cfg.DIST b/xymond/etcfiles/xymonserver.cfg.DIST
index a392edf..b345156 100644
--- a/xymond/etcfiles/xymonserver.cfg.DIST
+++ b/xymond/etcfiles/xymonserver.cfg.DIST
@@ -36,8 +36,8 @@ DELAYYELLOW=""			# Format: status:delay[,status:delay - e.g. "cpu:15,disk:30"
 
 # General settings
 XYMONDPORT="1984"		# Portnumber where xymond listens
-XYMSRV="$XYMONSERVERIP"		# IP of a single Xymon server
-XYMSERVERS=""			# IP of multiple Xymon servers. If used, XYMSRV must be 0.0.0.0
+XYMSRV="0.0.0.0"		# IP of a single Xymon server
+XYMSERVERS="$XYMONSERVERIP"	# IP of multiple Xymon servers. If used, XYMSRV must be 0.0.0.0
 FQDN="TRUE"			# Use fully-qualified hostnames internally. Keep it TRUE unless you know better.
 XYMONLOGSTATUS="DYNAMIC"	# Are HTML status logs statically or dynamically generated?
 				# Use DYNAMIC with Xymon, unless you run xymond_filestore --status --html
-- 
1.8.4.5


From ac860fe8778f748411869eedd6a4f3ca05285b5f Mon Sep 17 00:00:00 2001
From: William Murphy <warrendiogenese@gmail.com>
Date: Thu, 7 Aug 2014 22:30:59 -0700
Subject: [PATCH 2/3] Patched usesysconfig

---
 client/xymonclient.cfg.DIST | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/xymonclient.cfg.DIST b/client/xymonclient.cfg.DIST
index 134a22d..b143fab 100644
--- a/client/xymonclient.cfg.DIST
+++ b/client/xymonclient.cfg.DIST
@@ -1,4 +1,6 @@
 # Environment settings for the Xymon client.
+include /etc/sysconfig/xymon-client
+
 
 XYMSRV="0.0.0.0"          # IP address of the Xymon server
 XYMSERVERS="$XYMONSERVERS"   # IP of multiple Xymon servers. XYMSRV must be "0.0.0.0".
-- 
1.8.4.5


From 6074534cd3278f3b8982a2864408bf218d140545 Mon Sep 17 00:00:00 2001
From: William Murphy <warrendiogenese@gmail.com>
Date: Thu, 7 Aug 2014 22:30:59 -0700
Subject: [PATCH 3/3] Patched serverclient

---
 xymond/etcfiles/tasks.cfg.DIST | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/xymond/etcfiles/tasks.cfg.DIST b/xymond/etcfiles/tasks.cfg.DIST
index 5cd7b56..14eeb4e 100644
--- a/xymond/etcfiles/tasks.cfg.DIST
+++ b/xymond/etcfiles/tasks.cfg.DIST
@@ -188,11 +188,14 @@
 ### 
 ######################################################################################
 
+# NB: See below
+
 # "xymonclient" runs the Xymon client. The client is installed automatically
 # when you install a Xymon server (presumably, you do want to monitor the 
 # Xymon server ?), but there's no need to have two xymonlaunch instances
 # running at the same time. So we'll just run it from here.
 [xymonclient]
+	DISABLED
 	ENVFILE @XYMONTOPDIR@/client/etc/xymonclient.cfg
 	NEEDS xymond
 	CMD @XYMONTOPDIR@/client/bin/xymonclient.sh
@@ -200,6 +203,12 @@
 	INTERVAL 5m
 
 
+# The local xymon-client tasks are run from and modified in 
+# @XYMONTOPDIR@/client/etc/clientlaunch.cfg. You should 
+# make any changes to the "local client" on this Xymon Server there.
+
+include @XYMONTOPDIR@/client/etc/clientlaunch.cfg
+
 
 ######################################################################################
 ### 
-- 
1.8.4.5