entrouvert
/
portail-citoyen2
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

settings: change path of local static files

This commit is contained in:
Benjamin Dauvergne 2014-05-22 16:02:33 +02:00
parent ff40f36c46
commit 423943e76c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
portail_citoyen2/settings.py
View File

@ -48,7 +48,7 @@ USE_L10N = True
# Static files
STATIC_ROOT = os.environ.get('STATIC_ROOT', '/var/lib/%s/static' % PROJECT_NAME)
STATIC_ROOT = os.environ.get('STATIC_ROOT', '/var/lib/%s/collectstatic' % PROJECT_NAME)
STATIC_URL = os.environ.get('STATIC_URL', '/static/')
MEDIA_ROOT = os.environ.get('MEDIA_ROOT', '/var/lib/%s/media' % PROJECT_NAME)
MEDIA_URL = os.environ.get('MEDIA_URL', '/media/')
@ -57,8 +57,14 @@ MEDIA_URL = os.environ.get('MEDIA_URL', '/media/')
PASSERELLE_URL = os.environ.get('PASSERELLE_URL', '')
PASSERELLE_APIKEY = os.environ.get('PASSERELLE_APIKEY', '')
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 = os.environ['STATICFILES_DIRS'].split(':') + STATICFILES_DIRS
TEMPLATE_DIRS = ['/var/lib/%s/templates' % PROJECT_NAME, os.path.join(PROJECT_PATH, 'templates')]
if os.environ.get('TEMPLATE_DIRS'):
TEMPLATE_DIRS = os.environ['TEMPLATE_DIRS'].split(':') + TEMPLATE_DIRS
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
@ -99,10 +105,6 @@ MIDDLEWARE_CLASSES = (
ROOT_URLCONF = 'portail_citoyen2.urls'
TEMPLATE_DIRS = ['/var/lib/%s/templates' % PROJECT_NAME, os.path.join(PROJECT_PATH, 'templates')]
if os.environ.get('TEMPLATE_DIRS'):
TEMPLATE_DIRS = os.environ['TEMPLATE_DIRS'].split(':') + TEMPLATE_DIRS
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
@ -184,9 +186,6 @@ else:
SECRET_KEY = os.environ.get('SECRET_KEY', '0!=(1kc6kri-ui+tmj@mr+*0bvj!(p*r0duu2n=)7@!p=pvf9n')
SAML_METADATA_ROOT = 'metadata'
LOGGING = {
'version': 1,
'disable_existing_loggers': True,