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/xymon | |
| 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/xymon')
| -rwxr-xr-x | abs/core/xymon/PKGBUILD | 6 | ||||
| -rw-r--r-- | abs/core/xymon/hbnotes.py | 20 | ||||
| -rw-r--r-- | abs/core/xymon/xymon-server.rules | 1 |
3 files changed, 14 insertions, 13 deletions
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 |