Merge branch 'master' of /srv/git/projects/parabolaweb

1 files changed, 25 insertions, 19 deletions

diff --git a/settings.py b/settings.py
index 7d3c500f..e9285560 100644
--- a/settings.py
+++ b/settings.py
@@ -4,6 +4,7 @@ import os
 ## Set the debug values
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
+DEBUG_TOOLBAR = False
 
 ## Notification admins
 ADMINS = ()
@@ -44,13 +45,6 @@ LOGIN_REDIRECT_URL = '/'
 # Set django's User stuff to use our profile model
 AUTH_PROFILE_MODULE = 'main.UserProfile'
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.eggs.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-)
-
 # We add a processor to determine if the request is secure or not
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.auth.context_processors.auth',
@@ -61,6 +55,18 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'main.context_processors.secure',
 )
 
+TEMPLATE_DIRS = (
+    # Put strings here, like "/home/html/django_templates".
+    # Always use forward slashes, even on Windows.
+    '%s/templates' % DEPLOY_PATH,
+)
+
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.eggs.Loader',
+    'django.template.loaders.app_directories.Loader',
+)
+
 # This bug is a real bummer:
 # http://code.djangoproject.com/ticket/14105
 MIDDLEWARE_CLASSES = (
@@ -77,18 +83,6 @@ MIDDLEWARE_CLASSES = (
 
 ROOT_URLCONF = 'urls'
 
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates".
-    # Always use forward slashes, even on Windows.
-    '%s/templates' % DEPLOY_PATH,
-)
-
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.eggs.Loader',
-    'django.template.loaders.app_directories.Loader',
-)
-
 # Configure where sessions and messages should reside
 MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
 SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db'
@@ -110,6 +104,7 @@ INSTALLED_APPS = (
     'devel',
     'public',
     'south', # database migration support
+    'releng',
 )
 
 ## Import local settings
@@ -121,4 +116,15 @@ if not TEMPLATE_DEBUG:
         ('django.template.loaders.cached.Loader', TEMPLATE_LOADERS),
     )
 
+# Enable the debug toolbar if requested
+if DEBUG_TOOLBAR:
+    MIDDLEWARE_CLASSES = \
+            [ 'debug_toolbar.middleware.DebugToolbarMiddleware' ] + \
+            list(MIDDLEWARE_CLASSES)
+
+    INSTALLED_APPS = list(INSTALLED_APPS) + [ 'debug_toolbar' ]
+
+# URL to fetch a current list of available ISOs
+ISO_LIST_URL = 'http://repo.parabolagnulinux.org/isos/'
+
 # vim: set ts=4 sw=4 et: