[SCM] live-studio branch, master, updated. 47bbabbccf60b66a17cf892768e7376a6394dc53
Chris Lamb
lamby at debian.org
Fri Jul 30 19:56:51 UTC 2010
The following commit has been merged in the master branch:
commit 47bbabbccf60b66a17cf892768e7376a6394dc53
Author: Chris Lamb <lamby at debian.org>
Date: Fri Jul 30 15:55:26 2010 -0400
Use the cached template loader on the live site.
diff --git a/live_studio/settings/defaults/templates.py b/live_studio/settings/defaults/templates.py
index 3babd6a..8afd46f 100644
--- a/live_studio/settings/defaults/templates.py
+++ b/live_studio/settings/defaults/templates.py
@@ -10,6 +10,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
)
TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.load_template_source',
- 'django.template.loaders.app_directories.load_template_source',
+ ('django.template.loaders.cached.Loader', (
+ 'django.template.loaders.filesystem.Loader',
+ 'django.template.loaders.app_directories.Loader',
+ )),
)
diff --git a/live_studio/settings/roles/local.py b/live_studio/settings/roles/local.py
index c504c7f..b4dae97 100644
--- a/live_studio/settings/roles/local.py
+++ b/live_studio/settings/roles/local.py
@@ -9,3 +9,8 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
MEDIA_ROOT = join(_BASE, 'media')
BUILDS_ROOT = join(_BASE, 'builds')
TEMPLATE_DIRS = (join(_BASE, 'templates'),)
+
+TEMPLATE_LOADERS = (
+ 'django.template.loaders.filesystem.Loader',
+ 'django.template.loaders.app_directories.Loader',
+)
--
live-studio
More information about the debian-live-changes
mailing list