From e86d71ac0ac55fc228b754c7207a5729e0c703ed Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 1 Jul 2014 13:52:55 +0200 Subject: [PATCH] settings: import /etc/portail-citoyen/config.json and /etc/portail-citoyen/config.json --- portail_citoyen2/settings.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/portail_citoyen2/settings.py b/portail_citoyen2/settings.py index e595847..64ebdf9 100644 --- a/portail_citoyen2/settings.py +++ b/portail_citoyen2/settings.py @@ -57,6 +57,8 @@ MEDIA_URL = os.environ.get('MEDIA_URL', '/media/') PASSERELLE_URL = os.environ.get('PASSERELLE_URL', '') PASSERELLE_APIKEY = os.environ.get('PASSERELLE_APIKEY', '') +ETC_DIR = os.path.join('/etc', 'portail-citoyen') + STATICFILES_DIRS = ['/var/lib/%s/static' % PROJECT_NAME, os.path.join(PROJECT_PATH, 'static')] if 'STATICFILES_DIRS' in os.environ: STATICFILES_DIRS = os.environ['STATICFILES_DIRS'].split(':') + STATICFILES_DIRS @@ -314,6 +316,19 @@ for key in os.environ: pass globals()[setting_key] = value +JSON_CONFIG = os.path.join(ETC_DIR, 'config.json') + +if os.path.exists(JSON_CONFIG): + import json + globals().update(json.load(JSON_CONFIG)) + +PY_CONFIG = os.path.join(ETC_DIR, 'config.py') + +if os.path.exists(PY_CONFIG): + execfile(PY_CONFIG, globals()) + + + # try to import local_settings.py (useless, in theory) try: from local_settings import *