From 61bf87188ac64a68b4a1d5b075f5f07e5ccec5fc Mon Sep 17 00:00:00 2001 From: Francesco Siddi Date: Thu, 8 Oct 2015 10:26:22 +0200 Subject: [PATCH] Explicit settings.py declaration This is done so that we can load the settings.py on a wsgi instance. --- pillar/application/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pillar/application/__init__.py b/pillar/application/__init__.py index a30ffbce..da6a14af 100644 --- a/pillar/application/__init__.py +++ b/pillar/application/__init__.py @@ -223,8 +223,11 @@ class ValidateCustomFields(Validator): def post_item(entry, data): return post_internal(entry, data) - -app = Eve(validator=ValidateCustomFields, auth=CustomTokenAuth) +# We specify a settings.py file because when running on wsgi we can't detect it +# automatically. The default path (which work in Docker) can be overriden with +# an env variable. +settings_path = os.environ.get('EVE_SETTINGS', '/data/dev/pillar/pillar/settings.py') +app = Eve(settings=settings_path, validator=ValidateCustomFields, auth=CustomTokenAuth) import config app.config.from_object(config.Deployment)