From 20810138da3645a23c063337bba39f0f86d2fc6f Mon Sep 17 00:00:00 2001 From: Chase Sterling Date: Tue, 15 Dec 2015 22:46:55 -0500 Subject: [PATCH] Allow all config options to be specified in realms-wiki.json --- realms/config/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/realms/config/__init__.py b/realms/config/__init__.py index 1d06cde..3dba1a8 100644 --- a/realms/config/__init__.py +++ b/realms/config/__init__.py @@ -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')