diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-15 01:40:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-15 01:40:48 -0400 |
| commit | cdff1a234be0d625c5c824707dbae32ffa6a76dd (patch) | |
| tree | a9e029f2a98ad72e64d9e09a922ec39ab502a75b /settings.py | |
| parent | f18a6c809f45e71175ced6050d7e57bf4e7e89ba (diff) | |
| parent | 90873ef7de4bf842fbf6971836a373c555cfcbaa (diff) | |
Merge branch 'master-nomake'
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/settings.py b/settings.py index 074b3749..5ee17af3 100644 --- a/settings.py +++ b/settings.py @@ -61,11 +61,13 @@ TEMPLATE_DIRS = ( ) TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.eggs.Loader', - 'django.template.loaders.app_directories.Loader', + 'django_jinja.loaders.FileSystemLoader', + 'django_jinja.loaders.AppLoader', ) +# Send templates matching the following to the Jinja2 engine +DEFAULT_JINJA2_TEMPLATE_EXTENSION = '.jinja' + MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', @@ -116,6 +118,7 @@ INSTALLED_APPS = ( 'django.contrib.admin', 'django.contrib.staticfiles', 'django_countries', + 'django_jinja', 'main', 'mirrors', @@ -186,14 +189,14 @@ TORRENT_TRACKERS = ( 'udp://tracker.istole.it:80', ) -DOMAIN_RE = r'^(.+\.)?parabola.nu$' +DOMAIN_RE = r'^(.+\.)?parabola(\.nu|gnulinux\.org)$' BRANDING_APPNAME = 'parabolaweb' BRANDING_DISTRONAME = 'Parabola GNU/Linux-libre' BRANDING_SHORTNAME = 'Parabola' BRANDING_SLUG = 'parabola' BRANDING_WIKINAME = 'ParabolaWiki' -BRANDING_EMAIL = 'Parabola Website Notification <nobody@repo.parabola.nu>' +BRANDING_EMAIL = 'Parabola Website Notification <nobody@parabola.nu>' BRANDING_OSEARCH_TAGS = 'gnu linuxlibre parabola package software' ## Import local settings @@ -204,6 +207,7 @@ if not TEMPLATE_DEBUG: TEMPLATE_LOADERS = ( ('django.template.loaders.cached.Loader', TEMPLATE_LOADERS), ) + JINJA2_BYTECODE_CACHE_ENABLE = True # Enable the debug toolbar if requested if DEBUG_TOOLBAR: |