Merge branch 'testing'

6 files changed, 42 insertions, 27 deletions

diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 8441779..0c797ee 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,16 +1,16 @@
 pkgbase=xymon
 pkgname=(xymonserver xymonclient)
 pkgver=4.3.5
-pkgrel=44
+pkgrel=49
 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-server.xymon logrotate-client.xymon log_list.sh client-local.cfg.patch led_themes.tar.gz xymon-server.rules hosts.cfg.patch)
+source=(http://hivelocity.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 xymon-server.rules hosts.cfg.patch)
 
-depends=(rrdtool fping pcre python2 graphviz 'linhes-scripts>=7-24')
+depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz' 'LinHES-system>=8.0-5')
 
 install=xymon.install
 
@@ -74,7 +74,7 @@ package_xymonserver(){
       install -D  -m644 $startdir/src/logrotate-server.xymon $startdir/pkg/xymonserver/etc/logrotate.d/xymon-server
 
 # fix env for mythtb bindingds
-      echo "MYTHCONFDIR=/usr/share/mythtv" >> $startdir/pkg/xymonserver/home/xymon/etc/xymonserver.cfg 
+      echo "MYTHCONFDIR=/usr/share/mythtv" >> $startdir/pkg/xymonserver/home/xymon/etc/xymonserver.cfg
 
 
       #copy in replacment icon set
@@ -90,13 +90,16 @@ package_xymonserver(){
       patch -p0 <  $startdir/src/xymonserver.cfg.diff || return 1
       patch -p3 < $startdir/src/client-local.cfg.patch || return 1
       patch -p3 < $startdir/src/hosts.cfg.patch || return 1
-      
+
       #fix permissions
       chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/
       chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/
       chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/notes/
       chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/
+      chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/snap/
+      chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/rep/
       chmod 750 $startdir/pkg/xymonserver/etc/sudoers.d
+
     }
 
 
@@ -122,10 +125,10 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
          'c60b0d59bb39505ee3d62c6dd65429c5'
          'a45dd4cdb84817bcf3e51b25cc713799'
          '034658a1084510ecbbb0dc166c0401eb'
-         '2d88e59ab17114030da514ba3f0a5b64'
+         '758cdd9f1ba5ae3e1b42e811172806f3'
          'ee608dcafc050d790e28647a670f6b60'
          'b2f98ac0df013332deedc1efae0a270d'
-         'fc24435b97254f0954233319ba09689b'
+         'c31bcb503a227ed5ff7b218581793bfc'
          '0f70e76a164f648f0a4a01110137cb20'
          'f6921f0413215ae174e81306be80d37f'
          '80d9cfac86c6d96836e6f406e35e7cf5'
@@ -136,8 +139,8 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
          '622f400fd098cbc43c203e3210a6694e'
          '84442377c6e914b65519076bda4e17a4'
          'd7116dc59319b893e90a26e6beb83994'
-         '67621b6c5a766ac03c5f407bdbdca810'
-         '7ad4871af35f82c7824bb682b9325dba'
+         'b4e8641e97e6b689dbc634af785e6799'
+         'e2844513e2c92e8b5084818f3b2a478d'
          '98e9242ae346f729b14cb195786571f2'
          '31ac5c1f6dcc9408b64c4107b325a9a6'
          'c7178bbf384bbe86c318b60fef6faf10'
diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py
index be34dc6..d643044 100644
--- a/abs/core/xymon/hbnotes.py
+++ b/abs/core/xymon/hbnotes.py
@@ -219,7 +219,7 @@ def createdropdown(currenthostype):
     <input name="param2" type="radio" value="Optimize"  />Optimize database<br />
     '''
     if currenthostype == "Master_backend":
-        dropdown+='<input name="param2" type="radio" value="ShutdownAll"  />Shutdown All Systems (expect MBE)<br /> \n'
+        dropdown+='<input name="param2" type="radio" value="ShutdownAll"  />Shutdown All Systems (except master backend)<br /> \n'
     #dropdown+='''<input name="param2" type="radio"  value="UpdateAll" />Update All Systems </>           <select name="param5">
                    #<option value="Myth_only">Myth only</option>
                    #<option value="All"> Full System</option>
diff --git a/abs/core/xymon/logrotate-client.xymon b/abs/core/xymon/logrotate-client.xymon
index a312b64..ba48a0f 100644..100755
--- a/abs/core/xymon/logrotate-client.xymon
+++ b/abs/core/xymon/logrotate-client.xymon
@@ -1,14 +1,15 @@
-/home/xymon/client/logs/* {
-   missingok
-   size 512K
-   rotate 0
-   compress
-   postrotate
-       if [ -f /service/xymon-client/run ]
-       then
-         sv hup xymon-client
-       fi
+/home/xymon/client/logs/*.log {
+    missingok
+    notifempty
+    size 512k
+    rotate 2
+    compress
+    postrotate
+    if [ -f /service/xymon-client/run ]
+    then
+        sv hup xymon-client
+    fi
 
-   endscript
+    endscript
 
 }
diff --git a/abs/core/xymon/logrotate-server.xymon b/abs/core/xymon/logrotate-server.xymon
index 2267da8..a231470 100644
--- a/abs/core/xymon/logrotate-server.xymon
+++ b/abs/core/xymon/logrotate-server.xymon
@@ -1,7 +1,8 @@
-/var/log/hobbit/* {
+/var/log/hobbit/*.log /var/log/hobbit/*.pid {
    missingok
-   size 512K
-   rotate 0
+   notifempty
+   size 512k
+   rotate 2
    compress
    postrotate
        if [ -f /service/xymon-server/run ]
diff --git a/abs/core/xymon/tasks.d.mv b/abs/core/xymon/tasks.d.mv
index e113f37..5ea7841 100644
--- a/abs/core/xymon/tasks.d.mv
+++ b/abs/core/xymon/tasks.d.mv
@@ -30,7 +30,7 @@
 [mtc]
        ENVFILE /home/xymon/server/etc/xymonserver.cfg
        CMD  /home/xymon/server/ext/hobbit_myth_data.py
-       LOGFILE $BBSERVERLOGS/mtc
+       LOGFILE $BBSERVERLOGS/mtc.log
        INTERVAL 5m
 [ghost]
        ENVFILE /home/xymon/server/etc/xymonserver.cfg
diff --git a/abs/core/xymon/xymon.install b/abs/core/xymon/xymon.install
index 3c9680b..62feb36 100644..100755
--- a/abs/core/xymon/xymon.install
+++ b/abs/core/xymon/xymon.install
@@ -17,14 +17,24 @@ post_install() {
 	sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/hosts.cfg
 	sed -i -e "s/\# bbd/\# bbd func/" /home/xymon/server/etc/hosts.cfg
 	sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/xymonserver.cfg
+	#fix permissions
 	chown -R nobody /home/xymon
 	chown -R nobody /data/srv/httpd/htdocs/xymon
+
+
+	chown -R nobody:http /data/srv/httpd/htdocs/xymon/snap
+	chown -R nobody:http /data/srv/httpd/htdocs/xymon/rep
+	chmod -R 775   /data/srv/httpd/htdocs/xymon/rep
+	chmod -R 775   /data/srv/httpd/htdocs/xymon/snap
+
 	chown -R nobody /var/log/hobbit
+
 	chown root /home/xymon/server/bin/xymonping
 	chmod +s /home/xymon/server/bin/xymonping
 
-
-
+	#remove old mtc log files
+	rm -f /var/log/hobbit/mtc
+	rm -f /var/log/hobbit/mtc.1*
 
 
 }