fix openid login callback, change the forward URL after authentication if there are...

[osqa.git] / settings.py

diff --git a/settings.py b/settings.py
index f1c6f6b29a257f30730762bfb1194236409e4cc4..c895381aa312a061677ada146da8977e4d564440 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -7,6 +7,8 @@ SITE_ID = 1
 ADMIN_MEDIA_PREFIX = '/admin_media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 
+CACHE_MAX_KEY_LENGTH = 235
+
 TEMPLATE_LOADERS = [
     'django.template.loaders.filesystem.load_template_source',
     'django.template.loaders.app_directories.load_template_source',
@@ -15,6 +17,8 @@ TEMPLATE_LOADERS = [
 ]
 
 MIDDLEWARE_CLASSES = [
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.middleware.csrf.CsrfResponseMiddleware',
     'forum.middleware.django_cookies.CookiePreHandlerMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -23,22 +27,10 @@ MIDDLEWARE_CLASSES = [
     'forum.middleware.request_utils.RequestUtils',
     'forum.middleware.cancel.CancelActionMiddleware',
     'forum.middleware.admin_messages.AdminMessagesMiddleware',
+    'forum.middleware.custom_pages.CustomPagesFallbackMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
     'forum.middleware.django_cookies.CookiePostHandlerMiddleware',
 ]
-# Backwards compatibility. If we fail to import the CSRF middle-ware from the location
-# where it is supposed to be, we add the old middle-ware classes to the classes list.
-try:
-    from django.middleware.csrf import CsrfViewMiddleware
-    MIDDLEWARE_CLASSES = [
-        'django.middleware.csrf.CsrfViewMiddleware',
-        'django.middleware.csrf.CsrfResponseMiddleware',
-    ] + MIDDLEWARE_CLASSES
-except ImportError:
-    MIDDLEWARE_CLASSES = [
-        'django.contrib.csrf.middleware.CsrfViewMiddleware',
-        'django.contrib.csrf.middleware.CsrfResponseMiddleware',
-    ] + MIDDLEWARE_CLASSES
 
 TEMPLATE_CONTEXT_PROCESSORS = [
     'django.core.context_processors.request',
@@ -133,6 +125,13 @@ try:
 except:
     pass
 
+# Try loading Gunicorn web server
+try:
+    import gunicorn
+    INSTALLED_APPS.append('gunicorn')
+except ImportError:
+    pass
+
 if not DEBUG:
     try:
         import rosetta