From d4b98fc20be08e1d9935623540b0a15d34763da0 Mon Sep 17 00:00:00 2001
From: William Murphy <warrendiogenese@gmail.com>
Date: Sat, 9 Aug 2014 23:02:11 -0700
Subject: [PATCH] Fixed hardcoded environmental variables

---
 lib/environ.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/environ.c b/lib/environ.c
index e14c64f..246ac79 100644
--- a/lib/environ.c
+++ b/lib/environ.c
@@ -74,7 +74,7 @@ const static struct {
 	{ "HOSTSCFG", "$XYMONHOME/etc/hosts.cfg" },
 	{ "XYMON", "$XYMONHOME/bin/xymon" },
 	{ "XYMONGEN", "$XYMONHOME/bin/xymongen" },
-	{ "XYMONVAR", "$XYMONSERVERROOT/data" },
+	{ "XYMONVAR", "/var/lib/xymon" },
 	{ "XYMONACKDIR", "$XYMONVAR/acks" },
 	{ "XYMONDATADIR", "$XYMONVAR/data" },
 	{ "XYMONDISABLEDDIR", "$XYMONVAR/disabled" },
@@ -82,10 +82,12 @@ const static struct {
 	{ "XYMONHISTLOGS", "$XYMONVAR/histlogs" },
 	{ "XYMONRAWSTATUSDIR", "$XYMONVAR/logs" },
 	{ "XYMONWWWDIR", "$XYMONHOME/www" },
+	{ "XYMONSTATICWWWDIR", "$XYMONHOME/static" },
 	{ "XYMONHTMLSTATUSDIR", "$XYMONWWWDIR/html" },
-	{ "XYMONNOTESDIR", "$XYMONWWWDIR/notes" },
-	{ "XYMONREPDIR", "$XYMONWWWDIR/rep" },
-	{ "XYMONSNAPDIR", "$XYMONWWWDIR/snap" },
+	{ "XYMONNOTESDIR", "$XYMONVAR/notes" },
+	{ "XYMONHELPDIR", "$XYMONSTATICWWWDIR/help" },
+	{ "XYMONREPDIR", "/var/cache/xymon/rep" },
+	{ "XYMONSNAPDIR", "/var/cache/xymon/snap" },
 	{ "XYMONALLHISTLOG", "TRUE" },
 	{ "XYMONHOSTHISTLOG", "TRUE" },
 	{ "SAVESTATUSLOG", "TRUE" },
-- 
1.8.4.5