Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

settings: Migrate template settings to using TEMPLATES. 

This is cleaner and also is necessary preparation for supporting
Jinja2.
This commit is contained in:
Umair Khan 2016-05-06 14:07:41 +05:00 committed by Tim Abbott
parent a3acd5e8e9
commit 4620cd8483
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
zproject/settings.py
View File

@ -59,7 +59,6 @@ if not 'DEBUG' in globals():
# Uncomment end of next line to test JS/CSS minification. # Uncomment end of next line to test JS/CSS minification.
DEBUG = DEVELOPMENT # and platform.node() != 'your-machine' DEBUG = DEVELOPMENT # and platform.node() != 'your-machine'
TEMPLATE_DEBUG = DEBUG
if DEBUG: if DEBUG:
INTERNAL_IPS = ('127.0.0.1',) INTERNAL_IPS = ('127.0.0.1',)
@ -230,23 +229,37 @@ USE_L10N = True
USE_TZ = True USE_TZ = True
DEPLOY_ROOT = os.path.join(os.path.realpath(os.path.dirname(__file__)), '..') DEPLOY_ROOT = os.path.join(os.path.realpath(os.path.dirname(__file__)), '..')
TEMPLATE_DIRS = ( os.path.join(DEPLOY_ROOT, 'templates'), )
LOCALE_PATHS = ( os.path.join(DEPLOY_ROOT, 'locale'), ) LOCALE_PATHS = ( os.path.join(DEPLOY_ROOT, 'locale'), )
# Make redirects work properly behind a reverse proxy # Make redirects work properly behind a reverse proxy
USE_X_FORWARDED_HOST = True USE_X_FORWARDED_HOST = True
# List of callables that know how to import templates from various sources. # List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = ( LOADERS = [
'django.template.loaders.filesystem.Loader', 'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader', 'django.template.loaders.app_directories.Loader',
) ]
if PRODUCTION: if PRODUCTION:
# Template caching is a significant performance win in production. # Template caching is a significant performance win in production.
TEMPLATE_LOADERS = ( LOADERS = ['django.template.loaders.cached.Loader'] + LOADERS
('django.template.loaders.cached.Loader',
TEMPLATE_LOADERS), TEMPLATES = [
) {
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [
os.path.join(DEPLOY_ROOT, 'templates'),
],
'APP_DIRS': False,
'OPTIONS': {
'debug': DEBUG,
'loaders': LOADERS,
'context_processors': [
'zerver.context_processors.add_settings',
'zerver.context_processors.add_metrics',
],
},
},
]
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
# Our logging middleware should be the first middleware item. # Our logging middleware should be the first middleware item.
@ -881,11 +894,6 @@ LOGGING = {
} }
} }
TEMPLATE_CONTEXT_PROCESSORS = (
'zerver.context_processors.add_settings',
'zerver.context_processors.add_metrics',
)
ACCOUNT_ACTIVATION_DAYS=7 ACCOUNT_ACTIVATION_DAYS=7
LOGIN_REDIRECT_URL='/' LOGIN_REDIRECT_URL='/'