Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing

1 files changed, 16 insertions, 24 deletions

diff --git a/abs/core/supplemental-web/contents/process.py b/abs/core/supplemental-web/contents/process.py
index 93d16d9..9098ad6 100644
--- a/abs/core/supplemental-web/contents/process.py
+++ b/abs/core/supplemental-web/contents/process.py
@@ -99,11 +99,11 @@ def isblank(indict):
 def go_backup(myhost):
     myhostname = socket.gethostname()
     results="Nothing happened"
-    if myhostname.strip() == myhost.strip():
-        command= "sudo /usr/MythVantage/bin/backup_job"
-        command2="sleep 1; /data/srv/hobbit/server/ext/hbnotes.py"
-        results=os.popen(command,'r')
-        os.popen(command2,'r')
+    command= "sudo /usr/LH/bin/lh_system_backup_job"
+    print command
+    command2="sleep 1; /data/srv/hobbit/server/ext/hbnotes.py"
+    results=os.popen(command,'r')
+    os.popen(command2,'r')
 
     return  results
 
@@ -122,28 +122,20 @@ def go_restore(restorefile,myhost):
     return  results
 
 def go_optimize(myhost):
-    myhostname = socket.gethostname()
-    if myhostname.strip() == myhost.strip():
-       command="/usr/LH/bin/optimize_mythdb.py"
-       results=os.popen(command,'r')
-    else:
-        results='This host does not run a database'
+    #myhostname = socket.gethostname()
+    #if myhostname.strip() == myhost.strip():
+    command="/usr/LH/bin/optimize_mythdb.py"
+    print command
+    results=os.popen(command,'r')
+    #else:
+        #results='This host does not run a database'
     return  results
 
 def go_update(myhost,update_type):
-    myhostname = socket.gethostname()
-    if myhostname.strip() == myhost.strip():
-         cmd="sudo /usr/bin/update_system "
-         command=cmd + update_type
-
-    else:
-        cmd=" call pacman update_system "
-        cmd+=update_type
-        command="/usr/bin/func \"" + myhost.strip() + "*\"  " + cmd
-        print command
-
-        #print command
-
+    cmd=" call pacman update_system "
+    cmd+=update_type
+    command="/usr/bin/func \"" + myhost.strip() + "*\"  " + cmd
+    print command
     results=os.popen(command,'r')
     return  results