diff --git a/global-conf.sh b/global-conf.sh index 06e10d88b623b8a16a5302454e21206b29a2c076..0a250a069aff3c8787f400b52a506c30af40d686 100644 --- a/global-conf.sh +++ b/global-conf.sh @@ -108,6 +108,9 @@ BURP_MAIL_DEST='sysadmin@ubicast.eu' BURP_CLIENT_NAME= BURP_CLIENT_MAIL_DEST='sysadmin@ubicast.eu' +# -- tmbackup +BACKUP_SERVER='' + # -- FTP -- # move uploaded files into hotfolder # login:pass CSV separated diff --git a/tests/test_backup.py b/tests/test_backup.py index 6084d5d1afe45a08b469175c990f385a75d05a33..d26d11bfe2551a14805ea4ba82737303a54347a9 100755 --- a/tests/test_backup.py +++ b/tests/test_backup.py @@ -71,21 +71,21 @@ os.chdir(os.path.dirname(__file__)) if os.path.isfile('../utils.py'): es_utils = imp.load_source('es_utils', '../utils.py') conf = es_utils.load_conf() - BURP_SERVER = conf.get('BURP_SERVER') - if BURP_SERVER: - if not test_ssh(BURP_SERVER): + BACKUP_SERVER = conf.get('BACKUP_SERVER') + if BACKUP_SERVER: + if not test_ssh(BACKUP_SERVER): print('Failed to ssh into backup server') sys.exit(1) else: - if not test_last_backup_is_recent(BURP_SERVER): + if not test_last_backup_is_recent(BACKUP_SERVER): sys.exit(1) else: - if not test_backup_space(BURP_SERVER): + if not test_backup_space(BACKUP_SERVER): sys.exit(1) else: sys.exit(0) else: - print('No BURP_SERVER defined in config, untestable') + print('No BACKUP_SERVER defined in config, untestable') sys.exit(2) else: print('Unable to load config, untestable')