From 62af1a1ec7abfe25def72df6d9872736c378b786 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Fri, 21 Mar 2014 17:51:04 +0100
Subject: [PATCH] settings: adopt new layout for defining STATICFILES_DIRS and
 TEMPLATE_DIRS

---
 portail_citoyen/settings.py | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/portail_citoyen/settings.py b/portail_citoyen/settings.py
index 6a1fd46..83d3342 100644
--- a/portail_citoyen/settings.py
+++ b/portail_citoyen/settings.py
@@ -10,7 +10,8 @@ DEBUG_PROPAGATE_EXCEPTIONS = 'DEBUG_PROPAGATE_EXCEPTIONS' in os.environ
 USE_DEBUG_TOOLBAR = 'USE_DEBUG_TOOLBAR' in os.environ
 TEMPLATE_DEBUG = DEBUG
 
-PROJECT_PATH = os.path.join(os.path.dirname(__file__))
+BASE_DIR = os.path.dirname(__file__)
+PROJECT_PATH = os.path.join(BASE_DIR, '..')
 PROJECT_NAME = 'portail-citoyen'
 
 ADMINS = ()
@@ -26,7 +27,7 @@ MANAGERS = ADMINS
 DATABASES = {
     'default': {
         'ENGINE': os.environ.get('DATABASE_ENGINE', 'django.db.backends.sqlite3'),
-        'NAME': os.environ.get('DATABASE_NAME', os.path.join(PROJECT_PATH, '..', PROJECT_NAME + '.db')),
+        'NAME': os.environ.get('DATABASE_NAME', os.path.join(PROJECT_PATH, PROJECT_NAME + '.db')),
         'USER': os.environ.get('DATABASE_USER', ''),
         'PASSWORD': os.environ.get('DATABASE_PASSWORD', ''),
         'HOST': os.environ.get('DATABASE_HOST', ''),
@@ -57,9 +58,6 @@ MEDIA_URL = os.environ.get('MEDIA_URL', '/media/')
 PASSERELLE_URL = os.environ.get('PASSERELLE_URL', '')
 PASSERELLE_APIKEY = os.environ.get('PASSERELLE_APIKEY', '')
 
-if 'STATICFILES_DIRS' in os.environ:
-    STATICFILES_DIRS = os.environ['STATICFILES_DIRS'].split(':')
-
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
@@ -99,13 +97,23 @@ PORTAIL_CITOYEN_FAVICON_URL = ''
 
 ROOT_URLCONF = 'portail_citoyen.urls'
 
-TEMPLATE_DIRS = [os.path.join(PROJECT_PATH, 'templates')]
-if os.environ.get('TEMPLATE_DIRS'):
-    TEMPLATE_DIRS = os.environ['TEMPLATE_DIRS'].split(':') + TEMPLATE_DIRS
-else:
-    TEMPLATE_DIRS = ['/var/lib/%s/templates' % PROJECT_NAME] + TEMPLATE_DIRS
+VAR_DIR = os.path.join('/var/lib/', PROJECT_NAME)
 
-TEMPLATE_DIRS = tuple(TEMPLATE_DIRS)
+TEMPLATE_DIRS = (
+        os.path.join(VAR_DIR, 'templates'),
+        os.path.join(BASE_DIR, 'templates'),
+)
+
+STATICFILES_DIRS = (
+        os.path.join(VAR_DIR, 'extra-static'),
+        os.path.join(BASE_DIR, 'static'),
+)
+
+if os.environ.get('TEMPLATE_DIRS'):
+    TEMPLATE_DIRS = tuple(os.environ['TEMPLATE_DIRS'].split(':')) + TEMPLATE_DIRS
+
+if os.environ.get('STATICFILES_DIRS'):
+    STATICFILES_DIRS = tuple(os.environ['STATICFILES_DIRS'].split(':')) + STATICFILES_DIRS
 
 INSTALLED_APPS = (
     'admin_tools',