From 2770f85e01bb0b4101ea32084e538fa2e1afade7 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Mon, 9 Dec 2019 17:50:36 -0700 Subject: [PATCH] Moved server definitions to wk/cfg/net.py --- scripts/wk/cfg/main.py | 12 ++---------- scripts/wk/cfg/net.py | 29 +++++++++++++++++++++++++++++ scripts/wk/std.py | 2 +- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/scripts/wk/cfg/main.py b/scripts/wk/cfg/main.py index aef91b61..99a3b2a1 100644 --- a/scripts/wk/cfg/main.py +++ b/scripts/wk/cfg/main.py @@ -1,6 +1,7 @@ """WizardKit: Config - Main -NOTE: A non-standard format is used for BASH/BATCH/PYTHON compatibility""" +NOTE: Non-standard formating is used for BASH/BATCH/PYTHON compatibility +""" # pylint: disable=bad-whitespace # vim: sts=2 sw=2 ts=2 @@ -30,15 +31,6 @@ TECH_PASSWORD='Abracadabra' LINUX_TIME_ZONE='America/Denver' WINDOWS_TIME_ZONE='Mountain Standard Time' -# Misc -CRASH_SERVER = { - 'Name': 'CrashServer', - 'Url': '', - 'User': '', - 'Pass': '', - 'Headers': {'X-Requested-With': 'XMLHttpRequest'}, - } - if __name__ == '__main__': print("This file is not meant to be called directly.") diff --git a/scripts/wk/cfg/net.py b/scripts/wk/cfg/net.py index 344c695b..cdcf7082 100644 --- a/scripts/wk/cfg/net.py +++ b/scripts/wk/cfg/net.py @@ -1,6 +1,35 @@ """WizardKit: Config - Net""" +# pylint: disable=bad-whitespace # vim: sts=2 sw=2 ts=2 +# Servers +BACKUP_SERVERS = { + 'Server One': { + 'IP': '10.0.0.10', + 'Share': 'Backups', + 'RO-User': 'restore', + 'RO-Pass': 'Abracadabra', + 'RW-User': 'backup', + 'RW-Pass': 'Abracadabra', + }, + 'Server Two': { + 'IP': '10.0.0.11', + 'Share': 'Backups', + 'RO-User': 'restore', + 'RO-Pass': 'Abracadabra', + 'RW-User': 'backup', + 'RW-Pass': 'Abracadabra', + }, + } +CRASH_SERVER = { + 'Name': 'CrashServer', + 'Url': '', + 'User': '', + 'Pass': '', + 'Headers': {'X-Requested-With': 'XMLHttpRequest'}, + } + + if __name__ == '__main__': print("This file is not meant to be called directly.") diff --git a/scripts/wk/std.py b/scripts/wk/std.py index d0eecde4..c82d13be 100644 --- a/scripts/wk/std.py +++ b/scripts/wk/std.py @@ -27,12 +27,12 @@ except ImportError: raise from wk.cfg.main import ( - CRASH_SERVER, ENABLED_UPLOAD_DATA, INDENT, SUPPORT_MESSAGE, WIDTH, ) +from wk.cfg.net import CRASH_SERVER # STATIC VARIABLES