Add support for LDAP / AD authentication.

[astakos] / snf-astakos-app / astakos / im / synnefo_settings.py

diff --git a/snf-astakos-app/astakos/im/synnefo_settings.py b/snf-astakos-app/astakos/im/synnefo_settings.py
index bff83d9..25c721f 100644 (file)
--- a/snf-astakos-app/astakos/im/synnefo_settings.py
+++ b/snf-astakos-app/astakos/im/synnefo_settings.py
@@ -48,20 +48,31 @@ installed_apps = [
 context_processors = [
     'django.core.context_processors.media',
     'django.core.context_processors.request',
+    'django.core.context_processors.csrf',
     'astakos.im.context_processors.media',
-    'astakos.im.context_processors.cloudbar',
     'astakos.im.context_processors.im_modules',
     'astakos.im.context_processors.next',
     'astakos.im.context_processors.code',
-    'astakos.im.context_processors.invitations'
+    'astakos.im.context_processors.invitations',
+    'astakos.im.context_processors.menu',
+    'astakos.im.context_processors.custom_messages',
+    'synnefo.lib.context_processors.cloudbar'
 ]
 
 middlware_classes = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'astakos.im.middleware.CookieAuthenticationMiddleware',
     'synnefo.lib.middleware.LoggingConfigMiddleware',
-    'synnefo.lib.middleware.SecureMiddleware'
+    'synnefo.lib.middleware.SecureMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware'
 ]
 
+loggers = {
+        'astakos': {
+            'handlers': ['console'],
+            'level': 'INFO'
+        }
+}
 
 static_files = {'astakos.im': ''}
 
@@ -70,36 +81,4 @@ AUTHENTICATION_BACKENDS = ('astakos.im.auth_backends.EmailBackend',
                             'astakos.im.auth_backends.TokenBackend')
 LOGIN_URL = '/im'
 
-# The server is behind a proxy (apache and gunicorn setup).
-USE_X_FORWARDED_HOST = False
-
 CUSTOM_USER_MODEL = 'astakos.im.AstakosUser'
-
-# Setup logging (use this name for the setting to avoid conflicts with django > 1.2.x).
-LOGGING_SETUP = {
-    'version': 1,
-    'disable_existing_loggers': True,
-    'formatters': {
-        'simple': {
-            'format': '%(message)s'
-        },
-        'verbose': {
-            'format': '%(asctime)s [%(levelname)s] %(name)s %(message)s'
-        },
-    },
-    'handlers': {
-        'null': {
-            'class': 'logging.NullHandler',
-        },
-        'console': {
-            'class': 'logging.StreamHandler',
-            'formatter': 'verbose'
-        },
-    },
-    'loggers': {
-        'astakos': {
-            'handlers': ['console'],
-            'level': 'INFO'
-        },
-    }
-}