xymon/runit scripts: moved from /data/srv/xymon to /home/xymon.

This was done to preserve rrd's on upgrade

1 files changed, 37 insertions, 37 deletions

diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 14b7574..08b7341 100644..100755
--- 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')