Reorderd to override from env over credstash over config

This commit is contained in:
Martyn Inglis
2016-01-19 15:01:45 +00:00
parent 6c46d92dd4
commit 19ea0de766

View File

@@ -75,15 +75,16 @@ def init_csrf(application):
def init_app(app, config_overrides):
for key, value in app.config.items():
if key in os.environ:
app.config[key] = convert_to_boolean(os.environ[key])
if config_overrides:
for key in app.config.keys():
if key in config_overrides:
app.config[key] = config_overrides[key]
for key, value in app.config.items():
if key in os.environ:
app.config[key] = convert_to_boolean(os.environ[key])
@app.context_processor
def inject_global_template_variables():
return {'asset_path': '/static/'}