xymon: add led theme

  logrotate: send hup after rotate
  hbfunc: general rewrite
  hbnotes: better output formatting for the dot file, fix slave tuners in the dot file

1 files changed, 21 insertions, 10 deletions

diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 560bbeb..9c1ef87 100644
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,14 +1,14 @@
 pkgbase=xymon
 pkgname=(xymonserver xymonclient)
 pkgver=4.3.5
-pkgrel=24
+pkgrel=25
 pkgdesc="Hobbit is a system for monitoring servers and networks. "
 license="GPL"
 arch=('i686' 'x86_64')
 
 url="http://www.xymon.com/"
 
-source=(http://voxel.dl.sourceforge.net/project/xymon/Xymon/4.3.5/xymon-4.3.5.tar.gz  hobbitadd.py xymon_ghost_check graph.cfg.diff xymonserver.cfg.diff tasks.d.mv clientlaunch.cfg.patch hobbitstorage.py  hbnotes.py hobbit-myth-orphan.sh  analysis.cfg hbfunc.py be.png tuner.png tv.png  hobbit-mem-myth.sh hobbit_notify.sh alerts.cfg hobbit_myth_data.py logrotate.xymon log_list.sh client-local.cfg.patch)
+source=(http://voxel.dl.sourceforge.net/project/xymon/Xymon/4.3.5/xymon-4.3.5.tar.gz  hobbitadd.py xymon_ghost_check graph.cfg.diff xymonserver.cfg.diff tasks.d.mv clientlaunch.cfg.patch hobbitstorage.py  hbnotes.py hobbit-myth-orphan.sh  analysis.cfg hbfunc.py be.png tuner.png tv.png  hobbit-mem-myth.sh hobbit_notify.sh alerts.cfg hobbit_myth_data.py logrotate-server.xymon logrotate-client.xymon log_list.sh client-local.cfg.patch led_themes.tar.gz )
 depends=(rrdtool fping pcre python graphviz)
 install=xymon.install
 
@@ -46,6 +46,7 @@ build() {
 }
 
 package_xymonserver(){
+      backup=('data/srv/xymon/etc/hosts.cfg')
       cd $startdir/src/xymon-$pkgver
       make PKGBUILD=1 INSTALLROOT=$startdir/pkg/xymonserver install
       cd $startdir/src
@@ -67,12 +68,19 @@ package_xymonserver(){
       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
 
-      install -D  -m755 $startdir/src/logrotate.xymon $startdir/pkg/xymonserver/etc/logrotate.d/xymon
+      install -D  -m644 $startdir/src/logrotate-server.xymon $startdir/pkg/xymonserver/etc/logrotate.d/xymon-server
 
+      #copy in replacment icon set
+      DOCDIR=$startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon
+      cp -rp  $DOCDIR/gifs $DOCDIR/gifs.orig
+      cd $startdir/src/themes
+      cp -fp Common/* $DOCDIR/gifs/
+      cp -fp ModernLED/* $DOCDIR/gifs/
     #apply patches to conf file
 #      mkdir -p $startdir/pkg/xymonserver/data/srv/xymon/etc/tasks.d/
 #      mkdir -p $startdir/pkg/xymonserver/data/srv/xymon/etc/tasks.d/
-       cat  $startdir/src/tasks.d.mv >>  $startdir/pkg/xymonserver/data/srv/xymon/etc/tasks.cfg
+       install -D -m755 $startdir/src/tasks.d.mv $startdir/pkg/xymonserver/data/srv/xymon/etc/tasks.d/mv.cfg
+#       cat  $startdir/src/tasks.d.mv >>  $startdir/pkg/xymonserver/data/srv/xymon/etc/tasks.cfg
       cd $startdir/pkg/xymonserver/data/srv/xymon/etc
       patch -p0 <  $startdir/src/graph.cfg.diff || return 1 
       patch -p0 <  $startdir/src/xymonserver.cfg.diff || return 1
@@ -86,10 +94,11 @@ package_xymonserver(){
 package_xymonclient(){
     #create client package as well
     depends=()
+     backup=('data/srv/xymon/client/etc/xymonclient.cfg')
     install=xymon-client.install
 
-     install -D -m755 $startdir/src/log_list.sh $startdir/pkg/xymon/client/data/srv/xymon/client/bin/log_list.sh
-    install -D  -m755 $startdir/src/logrotate.xymon $startdir/pkg/xymonclient/etc/logrotate.d/xymon
+     install -D -m755 $startdir/src/log_list.sh $startdir/pkg/xymonclient/data/srv/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/
 
@@ -109,10 +118,10 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
          'cc845b5aedc33dda8e3103b915fe4967'
          '650b523d879f32c1bad3b4a9e10e7c93'
          '093648dabb0d1da0fdcc37b327737f43'
-         '62b73cf181fdc227c95aade509b65c0a'
+         '84f6b0db44e5142bb59aeabc7ea875af'
          '6eb6ecdf33454f35b6c2409b863c816f'
          'f6921f0413215ae174e81306be80d37f'
-         'c08b0f116674b1eb8cd5902c1f497644'
+         'be02f5d21373f97224ffa4727ec9718a'
          'd210c43fb9ee9ad6cd7648e0c2e0efea'
          '0c808fa12672289f86b0651545381308'
          '0469d775db9fdd18ea95dd41937ada82'
@@ -120,6 +129,8 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
          '622f400fd098cbc43c203e3210a6694e'
          'd06c4327cc69aeead3fa05f39660f33e'
          '129353c8ad92e89c691382a98dd5ce77'
-         'e6a3ed8b8f6abe357bd1736ff1e63001'
+         'f6ff1fb4bacee930007b877424619b30'
+         'e06147db25d75cf246886137a4ea164a'
          '98e9242ae346f729b14cb195786571f2'
-         '40fa09bdb1ae60f3fe767f1c6a979b65')
+         '40fa09bdb1ae60f3fe767f1c6a979b65'
+         'c7178bbf384bbe86c318b60fef6faf10')