# HG changeset patch # User Ludovic Chabant # Date 1499059284 25200 # Node ID ca357249a321b19541521fd4ad088e550cb6db5e # Parent 14cca285f73b6df589fc6141f7d708eeec2aee21 admin: Read an optional Flask-app configuration file. diff -r 14cca285f73b -r ca357249a321 piecrust/admin/web.py --- a/piecrust/admin/web.py Sun Jul 02 22:20:48 2017 -0700 +++ b/piecrust/admin/web.py Sun Jul 02 22:21:24 2017 -0700 @@ -12,12 +12,15 @@ app = Flask(__name__.split('.')[0], static_folder=None) app.config.from_object('piecrust.admin.settings') - app.config.from_envvar('FOODTRUCK_SETTINGS', silent=True) if extra_settings: app.config.update(extra_settings) root_dir = app.config.setdefault('FOODTRUCK_ROOT', os.getcwd()) + app.config.from_pyfile(os.path.join(root_dir, 'admin_app.cfg'), + silent=True) + app.config.from_envvar('FOODTRUCK_SETTINGS', silent=True) + # Add a special route for the `.well-known` directory. app.wsgi_app = SharedDataMiddleware( app.wsgi_app,