trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing settings.ini wbconf

This commit is contained in:
Cayo Puigdefabregas 2021-05-26 11:00:43 +02:00
parent db8c7e6ce0
commit 816411aa7b
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ereuse_devicehub/config.py
View File

@ -44,6 +44,8 @@ class DevicehubConfig(Config):
host=DB_HOST, host=DB_HOST,
db=DB_DATABASE, db=DB_DATABASE,
) # type: str ) # type: str
SCHEMA = config('SCHEMA', 'dbtest')
HOST = config('HOST', 'localhost')
MIN_WORKBENCH = StrictVersion('11.0a1') # type: StrictVersion MIN_WORKBENCH = StrictVersion('11.0a1') # type: StrictVersion
"""The minimum version of ereuse.org workbench that this devicehub """The minimum version of ereuse.org workbench that this devicehub
accepts. we recommend not changing this value. accepts. we recommend not changing this value.

4
ereuse_devicehub/resources/documents/documents.py
View File

@ -323,8 +323,8 @@ class WbConfDocumentView(DeviceView):
return jsonify('') return jsonify('')
data = {'token': self.get_token(), data = {'token': self.get_token(),
'host': app.config['DB_HOST'], 'host': app.config['HOST'],
'inventory': app.config['DB_SCHEMA'] 'inventory': app.config['SCHEMA']
} }
data['erase'] = False data['erase'] = False
# data['erase'] = True if wbtype == 'usodywipe' else False # data['erase'] = True if wbtype == 'usodywipe' else False

20
ereuse_devicehub/resources/documents/templates/documents/wbSettings.ini
View File

@ -1,17 +1,19 @@
[settings] [settings]
DH_TOKEN="{{token}}" DH_TOKEN = {{token}}
DH_HOST="{{host}}" DH_HOST = {{host}}
DH_DATABASE="{{inventory}}" DH_DATABASE = {{inventory}}
DEVICEHUB_URL=https://${DB_HOST}/${DB_DATABASE}/ DEVICEHUB_URL = https://${DB_HOST}/${DB_DATABASE}/
WB_BENCHMARK = False
WB_STRESS_TEST = 0
WB_SMART_TEST = ""
WB_ERASE = {{erase}} WB_BENCHMARK = True
WB_STRESS_TEST = 1
WB_SMART_TEST = short
WB_ERASE =
WB_ERASE_STEPS = 1 WB_ERASE_STEPS = 1
WB_ERASE_LEADING_ZEROS = False WB_ERASE_LEADING_ZEROS = False
WB_DEBUG = True WB_DEBUG = False