Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #96 from gazpachoking/config_fix

Browse source 
Allow all config options to be specified in realms-wiki.json
This commit is contained in:
Matthew Scragg 2015-12-18 09:38:37 -06:00
parent a27996d761 20810138da
commit 9643f79de3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
realms/config/__init__.py
View file

@ -169,8 +169,6 @@ WIKI_LOCKED_PAGES = []
ROOT_ENDPOINT = 'wiki.page' ROOT_ENDPOINT = 'wiki.page'
globals().update(read())
# Used by Flask-Login # Used by Flask-Login
LOGIN_DISABLED = ALLOW_ANON LOGIN_DISABLED = ALLOW_ANON
@ -196,6 +194,8 @@ if ENV != "DEV":
MODULES = ['wiki', 'search', 'auth'] MODULES = ['wiki', 'search', 'auth']
globals().update(read())
if globals().get('AUTH_LOCAL_ENABLE'): if globals().get('AUTH_LOCAL_ENABLE'):
MODULES.append('auth.local') MODULES.append('auth.local')