# First patch has a dependency on installstaticwww - remove if not applied
# 

--- xymond/Makefile.varlibwww	2012-04-26 17:41:08.566474390 -0700
+++ xymond/Makefile	2012-04-26 18:01:48.383910861 -0700
@@ -136 +136 @@
-	cat $(APACHECONF) | sed -e 's!@XYMONHOME@!$(XYMONHOME)!g' | sed -e 's!@INSTALLETCDIR@!$(INSTALLETCDIR)!g' | sed -e 's!@INSTALLWWWDIR@!$(INSTALLWWWDIR)!g' | sed -e 's!@INSTALLSTATICWWWDIR@!$(INSTALLSTATICWWWDIR)!g' | sed -e 's!@CGIDIR@!$(CGIDIR)!g' | sed -e 's!@SECURECGIDIR@!$(SECURECGIDIR)!g' | sed -e 's!@XYMONHOSTURL@!$(XYMONHOSTURL)!g' | sed -e 's!@XYMONCGIURL@!$(XYMONCGIURL)!g' | sed -e 's!@SECUREXYMONCGIURL@!$(SECUREXYMONCGIURL)!g' >etcfiles/xymon-apache.conf
+	cat $(APACHECONF) | sed -e 's!@XYMONHOME@!$(XYMONHOME)!g' | sed -e 's!@INSTALLETCDIR@!$(INSTALLETCDIR)!g' | sed -e 's!@INSTALLWWWDIR@!$(INSTALLWWWDIR)!g' | sed -e 's!@INSTALLSTATICWWWDIR@!$(INSTALLSTATICWWWDIR)!g' | sed -e 's!@XYMONVAR@!$(XYMONVAR)!g' | sed -e 's!@CGIDIR@!$(CGIDIR)!g' | sed -e 's!@SECURECGIDIR@!$(SECURECGIDIR)!g' | sed -e 's!@XYMONHOSTURL@!$(XYMONHOSTURL)!g' | sed -e 's!@XYMONCGIURL@!$(XYMONCGIURL)!g' | sed -e 's!@SECUREXYMONCGIURL@!$(SECUREXYMONCGIURL)!g' >etcfiles/xymon-apache.conf

--- xymond/etcfiles/xymonserver.cfg.DIST.varlibwww	2011-10-13 05:49:56.000000000 -0700
+++ xymond/etcfiles/xymonserver.cfg.DIST	2012-04-26 16:27:08.495686652 -0700
@@ -93 +93 @@
-XYMONNOTESDIR="$XYMONWWWDIR/notes"		# For notes-files (xymond_filestore --notes)
+XYMONNOTESDIR="$XYMONVAR/notes"			# For notes-files (xymond_filestore --notes)

--- xymond/xymonreports.sh.DIST.varlibwww	2012-04-26 12:40:43.758971657 -0700
+++ xymond/xymonreports.sh.DIST	2012-04-26 14:54:18.937816071 -0700
@@ -37,3 +37,3 @@
 # This is the top-level directory for the pre-generated reports.
-REPORTTOPDIR="$XYMONWWWDIR/periodic"
+REPORTTOPDIR="$XYMONVAR/periodic"
 REPORTTOPURL="$XYMONWEB/periodic"

--- xymond/etcfiles/xymon-apache-open.DIST.varlibwww	2012-04-26 18:21:44.209971417 -0700
+++ xymond/etcfiles/xymon-apache-open.DIST	2012-04-26 18:22:50.705755380 -0700
@@ -17,2 +17,16 @@
 
+Alias @XYMONHOSTURL@/periodic "@XYMONVAR@/periodic"
+<Directory "@XYMONVAR@/periodic">
+    Options Indexes FollowSymLinks Includes MultiViews
+    Order allow,deny
+    Allow from all
+</Directory>
+
+Alias @XYMONHOSTURL@/notes "@XYMONVAR@/notes"
+<Directory "@XYMONVAR@/notes">
+    Options Indexes FollowSymLinks Includes MultiViews
+    Order allow,deny
+    Allow from all
+</Directory>
+
 Alias @XYMONHOSTURL@/  "@INSTALLWWWDIR@/"
--- xymond/etcfiles/xymon-apache-secure.DIST.varlibwww	2012-04-26 18:21:44.209971417 -0700
+++ xymond/etcfiles/xymon-apache-secure.DIST	2012-04-26 18:23:52.825962842 -0700
@@ -17,2 +17,16 @@
 
+Alias @XYMONHOSTURL@/periodic "@XYMONVAR@/periodic"
+<Directory "@XYMONVAR@/periodic">
+    Options Indexes FollowSymLinks Includes MultiViews
+    Order allow,deny
+    Allow from all
+</Directory>
+
+Alias @XYMONHOSTURL@/notes "@XYMONVAR@/notes"
+<Directory "@XYMONVAR@/notes">
+    Options Indexes FollowSymLinks Includes MultiViews
+    Order allow,deny
+    Allow from all
+</Directory>
+
 Alias @XYMONHOSTURL@/  "@INSTALLWWWDIR@/"