Merge pull request #96 from gazpachoking/config_fix
Allow all config options to be specified in realms-wiki.json
This commit is contained in:
commit
9643f79de3
|
@ -169,8 +169,6 @@ WIKI_LOCKED_PAGES = []
|
|||
|
||||
ROOT_ENDPOINT = 'wiki.page'
|
||||
|
||||
globals().update(read())
|
||||
|
||||
# Used by Flask-Login
|
||||
LOGIN_DISABLED = ALLOW_ANON
|
||||
|
||||
|
@ -196,6 +194,8 @@ if ENV != "DEV":
|
|||
|
||||
MODULES = ['wiki', 'search', 'auth']
|
||||
|
||||
globals().update(read())
|
||||
|
||||
if globals().get('AUTH_LOCAL_ENABLE'):
|
||||
MODULES.append('auth.local')
|
||||
|
||||
|
|
Loading…
Reference in a new issue