settings: adopt new layout for defining STATICFILES_DIRS and TEMPLATE_DIRS
This commit is contained in:
parent
cc374f2467
commit
62af1a1ec7
|
@ -10,7 +10,8 @@ DEBUG_PROPAGATE_EXCEPTIONS = 'DEBUG_PROPAGATE_EXCEPTIONS' in os.environ
|
||||||
USE_DEBUG_TOOLBAR = 'USE_DEBUG_TOOLBAR' in os.environ
|
USE_DEBUG_TOOLBAR = 'USE_DEBUG_TOOLBAR' in os.environ
|
||||||
TEMPLATE_DEBUG = DEBUG
|
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'
|
PROJECT_NAME = 'portail-citoyen'
|
||||||
|
|
||||||
ADMINS = ()
|
ADMINS = ()
|
||||||
|
@ -26,7 +27,7 @@ MANAGERS = ADMINS
|
||||||
DATABASES = {
|
DATABASES = {
|
||||||
'default': {
|
'default': {
|
||||||
'ENGINE': os.environ.get('DATABASE_ENGINE', 'django.db.backends.sqlite3'),
|
'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', ''),
|
'USER': os.environ.get('DATABASE_USER', ''),
|
||||||
'PASSWORD': os.environ.get('DATABASE_PASSWORD', ''),
|
'PASSWORD': os.environ.get('DATABASE_PASSWORD', ''),
|
||||||
'HOST': os.environ.get('DATABASE_HOST', ''),
|
'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_URL = os.environ.get('PASSERELLE_URL', '')
|
||||||
PASSERELLE_APIKEY = os.environ.get('PASSERELLE_APIKEY', '')
|
PASSERELLE_APIKEY = os.environ.get('PASSERELLE_APIKEY', '')
|
||||||
|
|
||||||
if 'STATICFILES_DIRS' in os.environ:
|
|
||||||
STATICFILES_DIRS = os.environ['STATICFILES_DIRS'].split(':')
|
|
||||||
|
|
||||||
TEMPLATE_LOADERS = (
|
TEMPLATE_LOADERS = (
|
||||||
'django.template.loaders.filesystem.Loader',
|
'django.template.loaders.filesystem.Loader',
|
||||||
'django.template.loaders.app_directories.Loader',
|
'django.template.loaders.app_directories.Loader',
|
||||||
|
@ -99,13 +97,23 @@ PORTAIL_CITOYEN_FAVICON_URL = ''
|
||||||
|
|
||||||
ROOT_URLCONF = 'portail_citoyen.urls'
|
ROOT_URLCONF = 'portail_citoyen.urls'
|
||||||
|
|
||||||
TEMPLATE_DIRS = [os.path.join(PROJECT_PATH, 'templates')]
|
VAR_DIR = os.path.join('/var/lib/', PROJECT_NAME)
|
||||||
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
|
|
||||||
|
|
||||||
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 = (
|
INSTALLED_APPS = (
|
||||||
'admin_tools',
|
'admin_tools',
|
||||||
|
|
Reference in New Issue