From 98a003ea4ba6ffd0e529f30b14ce8cf24c4a9ebd Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Mon, 10 Sep 2012 17:43:38 -0500
Subject: xymon/runit scripts:  moved from /data/srv/xymon  to /home/xymon.
 This was done to preserve rrd's on upgrade

---
 abs/core/runit-scripts/PKGBUILD                    |  2 +-
 .../runitscripts/services/xymon-client/run         |  2 +-
 .../runitscripts/services/xymon-server/run         |  2 +-
 abs/core/xymon/PKGBUILD                            | 74 +++++++++++-----------
 abs/core/xymon/alerts.cfg                          |  4 +-
 abs/core/xymon/client-local.cfg.patch              | 10 +--
 abs/core/xymon/clientlaunch.cfg.patch              |  6 +-
 abs/core/xymon/hbfunc.py                           |  6 +-
 abs/core/xymon/hbnotes.py                          |  8 +--
 abs/core/xymon/hobbitadd.py                        |  4 +-
 abs/core/xymon/hobbitlaunch.cfg.diff               | 30 ++++-----
 abs/core/xymon/logrotate-client.xymon              |  4 +-
 abs/core/xymon/tasks.d.mv                          | 28 ++++----
 abs/core/xymon/xymon-client.install                |  4 +-
 abs/core/xymon/xymon.install                       | 22 +++----
 abs/core/xymon/xymon_ghost_check                   |  2 +-
 16 files changed, 104 insertions(+), 104 deletions(-)
 mode change 100644 => 100755 abs/core/xymon/PKGBUILD

diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 4c0d1d0..dac1d6d 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=2.1.1
-pkgrel=71
+pkgrel=72
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/xymon-client/run b/abs/core/runit-scripts/runitscripts/services/xymon-client/run
index a454c6b..fcd5093 100644
--- a/abs/core/runit-scripts/runitscripts/services/xymon-client/run
+++ b/abs/core/runit-scripts/runitscripts/services/xymon-client/run
@@ -46,7 +46,7 @@ do
 done
 
 XYMONCLIENTHOME="`dirname $0`"
-XYMONCLIENTHOME="/data/srv/xymon/client"
+XYMONCLIENTHOME="/home/xymon/client"
 export MACHINEDOTS SERVEROSTYPE XYMONOSSCRIPT XYMONCLIENTHOME CONFIGCLASS
 
 MACHINE="`echo $MACHINEDOTS | sed -e 's/\./,/g'`"
diff --git a/abs/core/runit-scripts/runitscripts/services/xymon-server/run b/abs/core/runit-scripts/runitscripts/services/xymon-server/run
index b850c0a..6198543 100644
--- a/abs/core/runit-scripts/runitscripts/services/xymon-server/run
+++ b/abs/core/runit-scripts/runitscripts/services/xymon-server/run
@@ -6,4 +6,4 @@ export TERM=linux
 stat_runit "Starting xymon server"
 
 
-exec sudo -u nobody  /data/srv/xymon/server/bin/xymonlaunch --config=/data/srv/xymon/server/etc/tasks.cfg --env=/data/srv/xymon/server/etc/xymonserver.cfg --log=/var/log/hobbit/xymonlaunch.log --pidfile=/var/log/hobbit/xymonlaunch.pid --no-daemon
+exec sudo -u nobody  /home/xymon/server/bin/xymonlaunch --config=/home/xymon/server/etc/tasks.cfg --env=/home/xymon/server/etc/xymonserver.cfg --log=/var/log/hobbit/xymonlaunch.log --pidfile=/var/log/hobbit/xymonlaunch.pid --no-daemon
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
old mode 100644
new mode 100755
index 14b7574..08b7341
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -21,8 +21,8 @@ build() {
     ENABLELDAP=n \
     ENABLELDAPSSL=n \
     XYMONUSER=nobody \
-    XYMONTOPDIR=/data/srv/xymon \
-    XYMONVAR=/data/srv/xymon/var \
+    XYMONTOPDIR=/home/xymon \
+    XYMONVAR=/home/xymon/var \
     XYMONHOSTURL=/xymon \
     CGIDIR=/data/srv/httpd/htdocs/xymon/hobbit-cgi \
     XYMONCGIURL=/xymon/hobbit-cgi \
@@ -36,11 +36,11 @@ build() {
     BARS=all \
     USENEWHIST=y \
     PIXELCOUNT=960 \
-    INSTALLBINDIR=/data/srv/xymon/server/bin \
-    INSTALLETCDIR=/data/srv/xymon/etc \
-    INSTALLWEBDIR=/data/srv/xymon/web \
-    INSTALLEXTDIR=/data/srv/xymon/server/ext \
-    INSTALLTMPDIR=/data/srv/xymon/tmp \
+    INSTALLBINDIR=/home/xymon/server/bin \
+    INSTALLETCDIR=/home/xymon/etc \
+    INSTALLWEBDIR=/home/xymon/web \
+    INSTALLEXTDIR=/home/xymon/server/ext \
+    INSTALLTMPDIR=/home/xymon/tmp \
     INSTALLWWWDIR=/data/srv/httpd/htdocs/xymon/ \
     ./configure
 
@@ -53,19 +53,19 @@ package_xymonserver(){
       make PKGBUILD=1 INSTALLROOT=$startdir/pkg/xymonserver install
       cd $startdir/src
       install -D -m400 $startdir/src/xymon-server.rules $startdir/pkg/xymonserver/etc/sudoers.d/xymon_server
-      install -D -m755 $startdir/src/hobbitadd.py  $startdir/pkg/xymonserver/data/srv/xymon/server/bin/hobbitadd.py
-      install -D -m755 $startdir/src/hobbitstorage.py  $startdir/pkg/xymonserver/data/srv/xymon/server/ext/hobbitstorage.py
-      install -D -m755 $startdir/src/hobbit-myth-orphan.sh $startdir/pkg/xymonserver/data/srv/xymon/server/ext/hobbit-myth-orphan.sh
-      install -D -m755 $startdir/src/hbfunc.py $startdir/pkg/xymonserver/data/srv/xymon/server/ext/hbfunc.py
-      install -D -m755 $startdir/src/hbnotes.py $startdir/pkg/xymonserver/data/srv/xymon/server/ext/hbnotes.py
-      install -D -m755 $startdir/src/hobbit_myth_data.py $startdir/pkg/xymonserver/data/srv/xymon/server/ext/hobbit_myth_data.py
-      install -D -m755 $startdir/src/hobbit-mem-myth.sh $startdir/pkg/xymonserver/data/srv/xymon/server/ext/hobbit-mem-myth.sh
-      install -D -m755 $startdir/src/log_list.sh $startdir/pkg/xymonserver/data/srv/xymon/client/bin/log_list.sh
-
-      install  -m755 analysis.cfg $startdir/pkg/xymonserver/data/srv/xymon/etc/analysis.cfg
-      cat alerts.cfg >> $startdir/pkg/xymonserver/data/srv/xymon/etc/alerts.cfg
-
-      install  -m755 hobbit_notify.sh $startdir/pkg/xymonserver/data/srv/xymon/server/bin/hobbit_notify.sh
+      install -D -m755 $startdir/src/hobbitadd.py  $startdir/pkg/xymonserver/home/xymon/server/bin/hobbitadd.py
+      install -D -m755 $startdir/src/hobbitstorage.py  $startdir/pkg/xymonserver/home/xymon/server/ext/hobbitstorage.py
+      install -D -m755 $startdir/src/hobbit-myth-orphan.sh $startdir/pkg/xymonserver/home/xymon/server/ext/hobbit-myth-orphan.sh
+      install -D -m755 $startdir/src/hbfunc.py $startdir/pkg/xymonserver/home/xymon/server/ext/hbfunc.py
+      install -D -m755 $startdir/src/hbnotes.py $startdir/pkg/xymonserver/home/xymon/server/ext/hbnotes.py
+      install -D -m755 $startdir/src/hobbit_myth_data.py $startdir/pkg/xymonserver/home/xymon/server/ext/hobbit_myth_data.py
+      install -D -m755 $startdir/src/hobbit-mem-myth.sh $startdir/pkg/xymonserver/home/xymon/server/ext/hobbit-mem-myth.sh
+      install -D -m755 $startdir/src/log_list.sh $startdir/pkg/xymonserver/home/xymon/client/bin/log_list.sh
+
+      install  -m755 analysis.cfg $startdir/pkg/xymonserver/home/xymon/etc/analysis.cfg
+      cat alerts.cfg >> $startdir/pkg/xymonserver/home/xymon/etc/alerts.cfg
+
+      install  -m755 hobbit_notify.sh $startdir/pkg/xymonserver/home/xymon/server/bin/hobbit_notify.sh
       install  -m755 $startdir/src/tv.png  $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/tv.png
       install  -m755 $startdir/src/tuner.png  $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/tuner.png
       install  -m755 $startdir/src/be.png  $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/be.png
@@ -79,11 +79,11 @@ package_xymonserver(){
       cp -fp Common/* $DOCDIR/gifs/
       cp -fp ModernLED/* $DOCDIR/gifs/
       #apply patches to conf file
-      install -D -m775 $startdir/src/tasks.d.mv $startdir/pkg/xymonserver/data/srv/xymon/etc/tasks.d/mv.cfg
-      cd $startdir/pkg/xymonserver/data/srv/xymon/etc
-      patch -p0 <  $startdir/src/graph.cfg.diff || return 1 
+      install -D -m775 $startdir/src/tasks.d.mv $startdir/pkg/xymonserver/home/xymon/etc/tasks.d/mv.cfg
+      cd $startdir/pkg/xymonserver/home/xymon/etc
+      patch -p0 <  $startdir/src/graph.cfg.diff || return 1
       patch -p0 <  $startdir/src/xymonserver.cfg.diff || return 1
-      patch -p4 < $startdir/src/client-local.cfg.patch || return 1
+      patch -p3 < $startdir/src/client-local.cfg.patch || return 1
 
       #fix permissions
       chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/
@@ -100,39 +100,39 @@ package_xymonclient(){
     backup=('data/srv/xymon/client/etc/xymonclient.cfg')
     install=xymon-client.install
 
-    install -D -m755 $startdir/src/log_list.sh $startdir/pkg/xymonclient/data/srv/xymon/client/bin/log_list.sh
+    install -D -m755 $startdir/src/log_list.sh $startdir/pkg/xymonclient/home/xymon/client/bin/log_list.sh
     install -D  -m644 $startdir/src/logrotate-client.xymon $startdir/pkg/xymonclient/etc/logrotate.d/xymon-client
-    install -D -m755 $startdir/src/hobbit-mem-myth.sh $startdir/pkg/xymonclient/data/srv/xymon/client/ext/hobbit-mem-myth.sh
-    cp -rp /$startdir/pkg/xymonserver/data/srv/xymon/client/ $startdir/pkg/xymonclient/data/srv/xymon/
+    install -D -m755 $startdir/src/hobbit-mem-myth.sh $startdir/pkg/xymonclient/home/xymon/client/ext/hobbit-mem-myth.sh
+    cp -rp /$startdir/pkg/xymonserver/home/xymon/client/ $startdir/pkg/xymonclient/home/xymon/
 
     cd -
-    cd $startdir/pkg/xymonclient/data/srv/xymon/client/etc
+    cd $startdir/pkg/xymonclient/home/xymon/client/etc
     patch -p0 <  $startdir/src/clientlaunch.cfg.patch
     cd -
     }
 
 md5sums=('31923ec126fe1c264fceb459d2175161'
-         'a18fac7a450846ca609cdb39e32a613a'
-         '0f79d9715a827fa845a114b74b2c190c'
+         '837f1073b5674c88534f93b03de27b6f'
+         'c60b0d59bb39505ee3d62c6dd65429c5'
          'a45dd4cdb84817bcf3e51b25cc713799'
          '034658a1084510ecbbb0dc166c0401eb'
-         'cc845b5aedc33dda8e3103b915fe4967'
-         '650b523d879f32c1bad3b4a9e10e7c93'
+         '2d88e59ab17114030da514ba3f0a5b64'
+         'ee608dcafc050d790e28647a670f6b60'
          'b2f98ac0df013332deedc1efae0a270d'
-         'c455faa46cbf4178d191ba6ab62527f5'
+         'a1ae327a6782d05f46528d604e763b6b'
          '0f70e76a164f648f0a4a01110137cb20'
          'f6921f0413215ae174e81306be80d37f'
-         '9f5deee017753d970ccc16486533c420'
+         '54ba9d7bff5875150e511c608ffc1e6a'
          'd210c43fb9ee9ad6cd7648e0c2e0efea'
          '0c808fa12672289f86b0651545381308'
          '0469d775db9fdd18ea95dd41937ada82'
          '0757294eec13771f8e63da23cf066796'
          '622f400fd098cbc43c203e3210a6694e'
-         'd06c4327cc69aeead3fa05f39660f33e'
+         '84442377c6e914b65519076bda4e17a4'
          '388dbe22d97198af0cd0bf1d18e96ce5'
          'f6ff1fb4bacee930007b877424619b30'
-         'e06147db25d75cf246886137a4ea164a'
+         'c6b43daf66228952fcd0bad5daf45500'
          '98e9242ae346f729b14cb195786571f2'
-         '40fa09bdb1ae60f3fe767f1c6a979b65'
+         '31ac5c1f6dcc9408b64c4107b325a9a6'
          'c7178bbf384bbe86c318b60fef6faf10'
          'fd14b6ebdee25d29ea6caf226e26362d')
diff --git a/abs/core/xymon/alerts.cfg b/abs/core/xymon/alerts.cfg
index 84c3ead..e458655 100644
--- a/abs/core/xymon/alerts.cfg
+++ b/abs/core/xymon/alerts.cfg
@@ -1,6 +1,6 @@
 
 HOST=* SERVICE=disk
-      SCRIPT /data/srv/xymon/server/bin/hobbit_notify.sh  1234567890 FORMAT=SMS REPEAT=10h COLOR=yellow
-      SCRIPT /data/srv/xymon/server/bin/hobbit_notify.sh  1234567890 FORMAT=SMS REPEAT=1h COLOR=red
+      SCRIPT /home/xymon/server/bin/hobbit_notify.sh  1234567890 FORMAT=SMS REPEAT=10h COLOR=yellow
+      SCRIPT /home/xymon/server/bin/hobbit_notify.sh  1234567890 FORMAT=SMS REPEAT=1h COLOR=red
 
 
diff --git a/abs/core/xymon/client-local.cfg.patch b/abs/core/xymon/client-local.cfg.patch
index 17ffd56..23754fb 100644
--- a/abs/core/xymon/client-local.cfg.patch
+++ b/abs/core/xymon/client-local.cfg.patch
@@ -1,11 +1,11 @@
---- data/srv/xymon/etc/client-local.cfg.orig	2011-12-07 18:46:45.391534998 +0000
-+++ data/srv/xymon/etc/client-local.cfg	2011-12-07 18:47:29.488200337 +0000
+--- home/xymon/etc/client-local.cfg.orig	2011-12-07 18:46:45.391534998 +0000
++++ home/xymon/etc/client-local.cfg	2011-12-07 18:47:29.488200337 +0000
 @@ -79,7 +79,7 @@
  log:/var/log/messages:10240
- 
+
  [linux]
 -log:/var/log/messages:10240
-+log:`/data/srv/xymon/client/bin/log_list.sh`:10240
++log:`/home/xymon/client/bin/log_list.sh`:10240
  ignore MARK
- 
+
  [linux22]
diff --git a/abs/core/xymon/clientlaunch.cfg.patch b/abs/core/xymon/clientlaunch.cfg.patch
index bb0e1c6..ec475f9 100644
--- a/abs/core/xymon/clientlaunch.cfg.patch
+++ b/abs/core/xymon/clientlaunch.cfg.patch
@@ -1,12 +1,12 @@
 --- clientlaunch.cfg.orig	2011-11-25 19:07:19.000000000 -0600
 +++ clientlaunch.cfg	2011-11-25 19:09:55.000000000 -0600
 @@ -25,4 +25,9 @@
- 	CMD $XYMONCLIENTHOME/bin/xymonclient.sh 
+ 	CMD $XYMONCLIENTHOME/bin/xymonclient.sh
  	LOGFILE $XYMONCLIENTLOGS/xymonclient.log
  	INTERVAL 5m
 +[memmyth]
 +       ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg
-+       CMD  /data/srv/xymon/client/ext/hobbit-mem-myth.sh
++       CMD  /home/xymon/client/ext/hobbit-mem-myth.sh
 +       LOGFILE $XYMONCLIENTLOGS/mythmem.log
 +       INTERVAL 5m
- 
+
diff --git a/abs/core/xymon/hbfunc.py b/abs/core/xymon/hbfunc.py
index 60d0bde..65b7902 100644
--- a/abs/core/xymon/hbfunc.py
+++ b/abs/core/xymon/hbfunc.py
@@ -12,7 +12,7 @@ import datetime
 BBLINE = ''
 BBCOLOR="green"
 DATE = time.strftime("%a %b %d %H:%M:%S %Z %Y", time.localtime(time.time()))
-BB="/data/srv/xymon/server/bin/xymon"
+BB="/home/xymon/server/bin/xymon"
 BBDISP="127.0.01"
 
 
@@ -119,7 +119,7 @@ def readbb():
         global mythtype
 
         try:
-                infile = open('/data/srv/xymon/etc/hosts.cfg', 'r')
+                infile = open('/home/xymon/etc/hosts.cfg', 'r')
         except(IOError), e:
           #print "couldn't open xymon hosts file"
           sys.exit(1)
@@ -208,7 +208,7 @@ local_myth_version=find_local_myth_version()
 for currentclient_a in hostlist:
     currentclient=currentclient_a.lower()
     print currentclient
-    cmd='/data/srv/xymon/server/bin/xymon 127.0.0.1  "query '
+    cmd='/home/xymon/server/bin/xymon 127.0.0.1  "query '
     cmd+=currentclient
     cmd+='.conn"'
     bbresults=os.popen(cmd,'r'	).readline().strip().split()
diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py
index ddf0ab4..cbf755b 100644
--- a/abs/core/xymon/hbnotes.py
+++ b/abs/core/xymon/hbnotes.py
@@ -150,7 +150,7 @@ def main(argv):
 
 
 #----------------------------------Create graphviz dot files
-    dotfilename="/data/srv/xymon/server/etc/mythdot"
+    dotfilename="/home/xymon/server/etc/mythdot"
 
     dotfile=open(dotfilename,'w')
     dotfile.write("digraph G {   " + "\n" )
@@ -201,10 +201,10 @@ def main(argv):
     results=os.popen(cmd,'r')
 
  #--------------------------------------------------
-    #hobbitfile="/data/srv/xymon/server/etc/hobbit-clients.cfg"
+    #hobbitfile="/home/xymon/server/etc/hobbit-clients.cfg"
 
     ###WHY WAS THIS HERE??
-    #hobbitfile="/data/srv/xymon/server/etc/tasks.cfg"
+    #hobbitfile="/home/xymon/server/etc/tasks.cfg"
     #hobbitf=open(hobbitfile,'r')
     #hobbitconfig=hobbitf.readlines()
     #hobbitf.close()
@@ -260,7 +260,7 @@ def main(argv):
        cursor.execute("select value,data  from settings where hostname=%s and value in ('HostSystemType','HostHwuuid');",(row))
        hostvalues=cursor.fetchall()
        found_uuid="false"
-       filename="/data/srv/xymon/server/www/notes/"
+       filename="/home/xymon/server/www/notes/"
        filename+=str(row[0])
        filename+=(".html")
 
diff --git a/abs/core/xymon/hobbitadd.py b/abs/core/xymon/hobbitadd.py
index 91963a4..c3c47ba 100644
--- a/abs/core/xymon/hobbitadd.py
+++ b/abs/core/xymon/hobbitadd.py
@@ -11,7 +11,7 @@ import sys
 def readbb():
     global bblist
     try:
-        infile = open('/data/srv/xymon/etc/hosts.cfg', 'r')
+        infile = open('/home/xymon/etc/hosts.cfg', 'r')
     except(IOError), e:
         print "couldn't open bb-hosts file"
         sys.exit(1)
@@ -64,7 +64,7 @@ def makenewbb():
             print "adding: " + nline
             numinserts = numinserts + 1
     if numinserts > 0:
-        outfile = open("/data/srv/xymon/etc/hosts.cfg","w")
+        outfile = open("/home/xymon/etc/hosts.cfg","w")
         #outfile = open("/tmp/new-bb","w")
         for i in outlist:
             outfile.write(i + '\n' )
diff --git a/abs/core/xymon/hobbitlaunch.cfg.diff b/abs/core/xymon/hobbitlaunch.cfg.diff
index 6239125..47da067 100644
--- a/abs/core/xymon/hobbitlaunch.cfg.diff
+++ b/abs/core/xymon/hobbitlaunch.cfg.diff
@@ -3,38 +3,38 @@
 @@ -204,3 +204,37 @@
  	LOGFILE $BBSERVERLOGS/hobbitclient.log
  	INTERVAL 5m
- 
+
 +[storage]
-+	
-+	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+	CMD /data/srv/hobbit/server/ext/hobbitstorage.py
++
++	ENVFILE /home/xymonserver/etc/hobbitserver.cfg
++	CMD /home/xymonserver/ext/hobbitstorage.py
 +	LOGFILE $BBSERVERLOGS/bb-storage.log
 +	INTERVAL 5m
 +[notes]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD /data/srv/hobbit/server/ext/hbnotes.py
++       ENVFILE /home/xymonserver/etc/hobbitserver.cfg
++       CMD /home/xymonserver/ext/hbnotes.py
 +       LOGFILE $BBSERVERLOGS/bb-notes.log
 +       INTERVAL 5m
 +[orphan]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD /data/srv/hobbit/server/ext/hobbit-myth-orphan.sh
++       ENVFILE /home/xymonserver/etc/hobbitserver.cfg
++       CMD /home/xymonserver/ext/hobbit-myth-orphan.sh
 +       LOGFILE $BBSERVERLOGS/orphan.log
 +       INTERVAL 5m
-+ 
++
 +[func]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD sudo /data/srv/hobbit/server/ext/hbfunc.py
++       ENVFILE /home/xymonserver/etc/hobbitserver.cfg
++       CMD sudo /home/xymonserver/ext/hbfunc.py
 +       LOGFILE $BBSERVERLOGS/hbfunc.log
 +       INTERVAL 5m
 +
 +[memmyth]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD  /data/srv/hobbit/server/ext/hobbit-mem-myth.sh
++       ENVFILE /home/xymonserver/etc/hobbitserver.cfg
++       CMD  /home/xymonserver/ext/hobbit-mem-myth.sh
 +       LOGFILE $BBSERVERLOGS/mythmem.log
 +       INTERVAL 5m
 +
 +[mtc]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD  /data/srv/hobbit/server/ext/hobbit_myth_data.py
++       ENVFILE /home/xymonserver/etc/hobbitserver.cfg
++       CMD  /home/xymonserver/ext/hobbit_myth_data.py
 +       LOGFILE $BBSERVERLOGS/mtc
 +       INTERVAL 5m
diff --git a/abs/core/xymon/logrotate-client.xymon b/abs/core/xymon/logrotate-client.xymon
index e1051aa..ac6ff61 100644
--- a/abs/core/xymon/logrotate-client.xymon
+++ b/abs/core/xymon/logrotate-client.xymon
@@ -1,6 +1,6 @@
-/data/srv/xymon/client/logs/* {
+/home/xymon/client/logs/* {
    missingok
-   daily 
+   daily
    rotate 2
    compress
    postrotate
diff --git a/abs/core/xymon/tasks.d.mv b/abs/core/xymon/tasks.d.mv
index 696cb4e..e113f37 100644
--- a/abs/core/xymon/tasks.d.mv
+++ b/abs/core/xymon/tasks.d.mv
@@ -1,39 +1,39 @@
 [storage]
 
-       ENVFILE /data/srv/xymon/server/etc/xymonserver.cfg
-       CMD /data/srv/xymon/server/ext/hobbitstorage.py
+       ENVFILE /home/xymon/server/etc/xymonserver.cfg
+       CMD /home/xymon/server/ext/hobbitstorage.py
        LOGFILE $BBSERVERLOGS/bb-storage.log
        INTERVAL 5m
 [notes]
-       ENVFILE /data/srv/xymon/server/etc/xymonserver.cfg
-       CMD /data/srv/xymon/server/ext/hbnotes.py
+       ENVFILE /home/xymon/server/etc/xymonserver.cfg
+       CMD /home/xymon/server/ext/hbnotes.py
        LOGFILE $BBSERVERLOGS/bb-notes.log
        INTERVAL 5m
 [orphan]
-       ENVFILE /data/srv/xymon/server/etc/xymonserver.cfg
-       CMD /data/srv/xymon/server/ext/hobbit-myth-orphan.sh
+       ENVFILE /home/xymon/server/etc/xymonserver.cfg
+       CMD /home/xymon/server/ext/hobbit-myth-orphan.sh
        LOGFILE $BBSERVERLOGS/orphan.log
        INTERVAL 5m
 
 [func]
-       ENVFILE /data/srv/xymon/server/etc/xymonserver.cfg
-       CMD  /data/srv/xymon/server/ext/hbfunc.py
+       ENVFILE /home/xymon/server/etc/xymonserver.cfg
+       CMD  /home/xymon/server/ext/hbfunc.py
        LOGFILE $BBSERVERLOGS/hbfunc.log
        INTERVAL 5m
 
 [memmyth]
-       ENVFILE /data/srv/xymon/server/etc/xymonserver.cfg
-       CMD  /data/srv/xymon/server/ext/hobbit-mem-myth.sh
+       ENVFILE /home/xymon/server/etc/xymonserver.cfg
+       CMD  /home/xymon/server/ext/hobbit-mem-myth.sh
        LOGFILE $BBSERVERLOGS/mythmem.log
        INTERVAL 5m
 
 [mtc]
-       ENVFILE /data/srv/xymon/server/etc/xymonserver.cfg
-       CMD  /data/srv/xymon/server/ext/hobbit_myth_data.py
+       ENVFILE /home/xymon/server/etc/xymonserver.cfg
+       CMD  /home/xymon/server/ext/hobbit_myth_data.py
        LOGFILE $BBSERVERLOGS/mtc
        INTERVAL 5m
 [ghost]
-       ENVFILE /data/srv/xymon/server/etc/xymonserver.cfg
-       CMD  /data/srv/xymon/server/bin/hobbitadd.py
+       ENVFILE /home/xymon/server/etc/xymonserver.cfg
+       CMD  /home/xymon/server/bin/hobbitadd.py
        LOGFILE $BBSERVERLOGS/hobbitadd.log
        INTERVAL 5m
diff --git a/abs/core/xymon/xymon-client.install b/abs/core/xymon/xymon-client.install
index 301fc1f..80210f1 100644
--- a/abs/core/xymon/xymon-client.install
+++ b/abs/core/xymon/xymon-client.install
@@ -1,7 +1,7 @@
 post_install() {
 	. /etc/systemconfig
-	sed -i -e "s/127.0.0.1/$dbhost/" /data/srv/xymon/client/etc/xymonclient.cfg
-	chown -R nobody /data/srv/xymon
+	sed -i -e "s/127.0.0.1/$dbhost/" /home/xymon/client/etc/xymonclient.cfg
+	chown -R nobody /home/xymon
 
 }
 
diff --git a/abs/core/xymon/xymon.install b/abs/core/xymon/xymon.install
index ec5e242..3abec38 100644
--- a/abs/core/xymon/xymon.install
+++ b/abs/core/xymon/xymon.install
@@ -1,9 +1,9 @@
 post_install() {
 	. /etc/systemconfig
-	if  [ ! -f   /data/srv/xymon/server/ext/ignoreclient.py ]
+	if  [ ! -f   /home/xymon/server/ext/ignoreclient.py ]
 	then
-		echo "#this is a list of hosts to ignore" >  /data/srv/xymon/server/ext/ignoreclient.py
-		echo ignorehosts=\"\'ignoreme1\',\'ignoreme2\'\" >> /data/srv/xymon/server/ext/ignoreclient.py
+		echo "#this is a list of hosts to ignore" >  /home/xymon/server/ext/ignoreclient.py
+		echo ignorehosts=\"\'ignoreme1\',\'ignoreme2\'\" >> /home/xymon/server/ext/ignoreclient.py
 	fi
 
 	if  [ ! -f  /data/srv/httpd/htdocs/failed_func_hosts ]
@@ -14,16 +14,16 @@ post_install() {
 	chmod 777 /data/srv/httpd/htdocs/failed_func_hosts
 
 
-	sed -i -e "s/localhost/$hostname/" /data/srv/xymon/server/etc/hosts.cfg
-	sed -i -e "s/\#/\# func/" /data/srv/xymon/server/etc/hosts.cfg
-	sed -i -e "s/localhost/$hostname/" /data/srv/xymon/server/etc/xymonserver.cfg
-	chown -R nobody /data/srv/xymon
+	sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/hosts.cfg
+	sed -i -e "s/\#/\# func/" /home/xymon/server/etc/hosts.cfg
+	sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/xymonserver.cfg
+	chown -R nobody /home/xymon
 	chown -R nobody /data/srv/httpd/htdocs/xymon
 	chown -R nobody /var/log/hobbit
-	chown root /data/srv/xymon/server/bin/xymonping
-	chmod +s /data/srv/xymon/server/bin/xymonping
-  
-  
+	chown root /home/xymon/server/bin/xymonping
+	chmod +s /home/xymon/server/bin/xymonping
+
+
 
 
 
diff --git a/abs/core/xymon/xymon_ghost_check b/abs/core/xymon/xymon_ghost_check
index e51efb6..3660e50 100644
--- a/abs/core/xymon/xymon_ghost_check
+++ b/abs/core/xymon/xymon_ghost_check
@@ -1,2 +1,2 @@
 #!/bin/bash
-/usr/bin/sudo  -u nobody  /data/srv/xymon/server/bin/hobbitadd.py
+/usr/bin/sudo  -u nobody  /home/xymon/server/bin/hobbitadd.py
-- 
cgit v0.12

