Poprawki stylu pokazywania przypisów.

[redakcja.git] / platforma / settings.py

diff --git a/platforma/settings.py b/platforma/settings.py
old mode 100755 (executable)
new mode 100644 (file)
index 2faab1b..83456f8
--- a/platforma/settings.py
+++ b/platforma/settings.py
@@ -78,17 +78,34 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

+

     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',

+    'django_cas.middleware.CASMiddleware',
+

     'django.middleware.doc.XViewMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
 )
 
     'django.middleware.doc.XViewMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
 )
 

+AUTHENTICATION_BACKENDS = (
+    'django.contrib.auth.backends.ModelBackend',
+    'django_cas.backends.CASBackend',
+)
+

 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
     PROJECT_ROOT + '/templates',
 )
 
 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
     PROJECT_ROOT + '/templates',
 )
 

+
+#
+# Central Auth System
+#
+## Set this to where the CAS server lives 
+# CAS_SERVER_URL = "http://cas.fnp.pl/
+CAS_ADMIN_PREFIX = "/admin/"
+CAS_LOGOUT_COMPLETELY = True
+

 # CSS and JS files to compress
 # COMPRESS_CSS = {
 #     'all': {
 # CSS and JS files to compress
 # COMPRESS_CSS = {
 #     'all': {


@@ -124,6 +141,11 @@ INSTALLED_APPS = (
     'toolbar',
 )
 
     'toolbar',
 )
 

+
+#
+# Nose tests
+#
+

 TEST_RUNNER = 'django_nose.run_tests'
 TEST_MODULES = ('wiki', 'toolbar', 'vstorage')
 NOSE_ARGS = (
 TEST_RUNNER = 'django_nose.run_tests'
 TEST_MODULES = ('wiki', 'toolbar', 'vstorage')
 NOSE_ARGS = (


@@ -155,12 +177,9 @@ formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(messag
 ch.setFormatter(formatter)
 log.addHandler(ch)
 
 ch.setFormatter(formatter)
 log.addHandler(ch)
 

-

 # Import localsettings file, which may override settings defined here
 try:
 # Import localsettings file, which may override settings defined here
 try:

-    EXTRA_INSTALLED_APPS = tuple()

     from localsettings import *
     from localsettings import *

-    INSTALLED_APPS += EXTRA_INSTALLED_APPS

 except ImportError:
     pass
 
 except ImportError:
     pass