Commit eb766709 authored by ale's avatar ale
Browse files

use the common environment variable APP_CONFIG to load Flask configs

parent 3e735d82
...@@ -97,7 +97,7 @@ def make_app(ca_instance, settings={}): ...@@ -97,7 +97,7 @@ def make_app(ca_instance, settings={}):
app.register_blueprint(ca_app) app.register_blueprint(ca_app)
if settings: if settings:
app.config.update(settings) app.config.update(settings)
app.config.from_envvar('CA_APP_SETTINGS', silent=True) app.config.from_envvar('APP_CONFIG', silent=True)
app.ca = ca_instance app.ca = ca_instance
return app return app
......
...@@ -397,7 +397,7 @@ def new_cert_dl(): ...@@ -397,7 +397,7 @@ def new_cert_dl():
def make_app(config={}): def make_app(config={}):
app = Flask(__name__) app = Flask(__name__)
app.config.update(config) app.config.update(config)
app.config.from_envvar('VPN_APP_SETTINGS', silent=True) app.config.from_envvar('APP_CONFIG', silent=True)
app.signer = Signer(app.config['SIGNER_SECRET']) app.signer = Signer(app.config['SIGNER_SECRET'])
app.zipcache = ZipCache(app.config['CACHE_DIR']) app.zipcache = ZipCache(app.config['CACHE_DIR'])
app.register_blueprint(vpn_admin) app.register_blueprint(vpn_admin)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment