LinHES-system, supplmental-web,xymon: renable and fix restore_job from web

7 files changed, 24 insertions, 21 deletions

diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 94c982e..145fb1d 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=2
-pkgrel=95
+pkgrel=96
 arch=('i686' 'x86_64')
 MVDIR=$startdir/pkg/usr/LH
 BINDIR=$startdir/pkg/usr/bin
@@ -80,7 +80,7 @@ md5sums=('a941af97fe534731a507b1d57c0c2aed'
          'd03aedeeeda0f5e9c1eb437411c88477'
          '94ce8f1d5085c0db7b267db8c2e9a3ff'
          '6a56efa9abcf914ebe380178749cf7ce'
-         '0e7b910fe26e9096e5531cd38f331292'
+         'ceec78815ed01af733cdbca14cb0942b'
          '859a80ddb4c234506379c605114c1343'
          '47e093e8cfe4b5b96602358e1f540832'
          '9f08fb2e821297841f1849c6221b87cb'
@@ -98,7 +98,7 @@ md5sums=('a941af97fe534731a507b1d57c0c2aed'
          '54ebcc024db2e0ebe8121305d8926767'
          '45f46d1f9193c8dde18e56369ec29a1e'
          'a8edbe7bc37e9932e8749d9f5f89c16f'
-         'afd621cd8a8cf5fcff5d00b9f340a9a9'
+         '116b0f62ed4e8dd6e437930deeb6e49e'
          'eb879fee9603a05d5420d4ce8ed9e450'
          'f1870a9522c79e6b248fcbf81dec3280'
          '84492954db16740f949d795b74383189'
diff --git a/abs/core/LinHES-system/lh_system_restore_job b/abs/core/LinHES-system/lh_system_restore_job
index c926371..6446e6d 100644
--- a/abs/core/LinHES-system/lh_system_restore_job
+++ b/abs/core/LinHES-system/lh_system_restore_job
@@ -30,7 +30,7 @@ if [ x$backupfile = x ]
 then
     usage
 fi
-
+MYTH_RUN_STATUS="1"
 . /etc/profile
 
 RESTOREDIR=$BACKUPDIR/restore
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 311292f..afbf678 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=supplemental-web
 pkgver=1.0
-pkgrel=25
+pkgrel=26
 arch=('i686' 'x86_64')
 MVDIR=$startdir/pkg/usr/MythVantage
 install=supplemental-web.install
diff --git a/abs/core/supplemental-web/contents/process.py b/abs/core/supplemental-web/contents/process.py
index 6ae7363..f6c6db1 100644
--- a/abs/core/supplemental-web/contents/process.py
+++ b/abs/core/supplemental-web/contents/process.py
@@ -101,7 +101,7 @@ def go_backup(myhost):
     results="Nothing happened"
     command= "sudo /usr/LH/bin/lh_system_backup_job"
     print command
-    command2="sleep 1; /data/srv/hobbit/server/ext/hbnotes.py"
+    command2="sleep 1; /home/xymon/server/ext/hbnotes.py"
     results=os.popen(command,'r')
     os.popen(command2,'r')
 
@@ -110,14 +110,16 @@ def go_backup(myhost):
 def go_restore(restorefile,myhost):
     myhostname = socket.gethostname()
     if myhostname.strip() == myhost.strip():
-        localcommand="sudo /usr/bin/restore_job.sh "
+        localcommand="sudo /usr/LH/bin/lh_system_restore_job "
         command= localcommand + restorefile
+
     else:
+        #this should never execute
         sshcmd="ssh -o StrictHostKeyChecking=no -o ConnectTimeout=1 -i /data/srv/.nobody_ssh/id_dsa mythtv@"
         sshcmd+=myhost.strip()
         cmd=' "sudo /usr/bin/restore_job.sh   "   '
         command=sshcmd + cmd + restorefile + " 2>&1 "
-
+    print command
     results=os.popen(command,'r')
     return  results
 
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 08b7341..b68d1fe 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,7 +1,7 @@
 pkgbase=xymon
 pkgname=(xymonserver xymonclient)
 pkgver=4.3.5
-pkgrel=32
+pkgrel=33
 pkgdesc="Hobbit is a system for monitoring servers and networks. "
 license="GPL"
 arch=('i686' 'x86_64')
@@ -119,7 +119,7 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
          '2d88e59ab17114030da514ba3f0a5b64'
          'ee608dcafc050d790e28647a670f6b60'
          'b2f98ac0df013332deedc1efae0a270d'
-         'a1ae327a6782d05f46528d604e763b6b'
+         '94e561bc2d9ba5755f04ed642485e83b'
          '0f70e76a164f648f0a4a01110137cb20'
          'f6921f0413215ae174e81306be80d37f'
          '54ba9d7bff5875150e511c608ffc1e6a'
@@ -135,4 +135,4 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
          '98e9242ae346f729b14cb195786571f2'
          '31ac5c1f6dcc9408b64c4107b325a9a6'
          'c7178bbf384bbe86c318b60fef6faf10'
-         'fd14b6ebdee25d29ea6caf226e26362d')
+         '72bf7caf0f53928d97ff5cd9810d6d4d')
diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py
index cbf755b..6751865 100644
--- a/abs/core/xymon/hbnotes.py
+++ b/abs/core/xymon/hbnotes.py
@@ -20,17 +20,17 @@ except:
 
 
 def createdropdown(currenthostype):
-    dir = "/myth/system_backup"
+    dir = "/data/storage/disk0/backup/system_backups"
     dropdown=" "
-    #dropdown='''
-     #<input name="param2" type="radio"  value="Restore" />Restore database </>
-     #<select name="param1">
-    #'''
-    #if os.path.exists(dir):
-        #files = os.listdir(dir)
-        #for file in os.listdir(dir):
-            #if (file.endswith(".tgz")):
-                #dropdown+='<option value="' + file + '">' + file + '</option> '
+    dropdown='''
+     <input name="param2" type="radio"  value="Restore" />Restore database </>
+     <select name="param1">
+    '''
+    if os.path.exists(dir):
+        files = os.listdir(dir)
+        for file in os.listdir(dir):
+            if (file.endswith(".tgz")):
+                dropdown+='<option value="' + file + '">' + file + '</option> '
     dropdown+='</select> <br><input name="param2" type="radio" value="Backup" checked="checked" />Backup database<br />  '
     dropdown+='<input name="param2" type="radio" value="Optimize"  />Optimize database<br />  '
     if currenthostype == "Master_backend":
diff --git a/abs/core/xymon/xymon-server.rules b/abs/core/xymon/xymon-server.rules
index be7b4dd..b0f6100 100644
--- a/abs/core/xymon/xymon-server.rules
+++ b/abs/core/xymon/xymon-server.rules
@@ -1,5 +1,6 @@
 #These rules are used by xymon-server
 nobody    ALL = NOPASSWD:/usr/bin/certmaster-ca
 http    ALL = NOPASSWD:/usr/LH/bin/lh_system_backup_job
+http    ALL = NOPASSWD:/usr/LH/bin/lh_system_restore_job
 http    ALL = NOPASSWD:/sbin/sv