diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-09-21 15:51:51 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-09-21 15:51:51 (GMT) |
| commit | 485dd2b2efb3b44d3cdaba2867243e16adee2381 (patch) | |
| tree | 2aa1a8ac4df71ccdfc5dcab1b173eac8ac07ef59 /abs/core/supplemental-web | |
| parent | e235a08c001227e1258b4c23b1c1e9bbe63d3256 (diff) | |
| download | linhes_pkgbuild-485dd2b2efb3b44d3cdaba2867243e16adee2381.zip linhes_pkgbuild-485dd2b2efb3b44d3cdaba2867243e16adee2381.tar.gz linhes_pkgbuild-485dd2b2efb3b44d3cdaba2867243e16adee2381.tar.bz2 | |
LinHES-system, supplmental-web,xymon: renable and fix restore_job from web
Diffstat (limited to 'abs/core/supplemental-web')
| -rw-r--r-- | abs/core/supplemental-web/PKGBUILD | 2 | ||||
| -rw-r--r-- | abs/core/supplemental-web/contents/process.py | 8 |
2 files changed, 6 insertions, 4 deletions
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 |