Fixes

[redakcja.git] / src / redakcja / settings / __init__.py

diff --git a/src/redakcja/settings/__init__.py b/src/redakcja/settings/__init__.py
index cc88ab8..9909754 100644 (file)
--- a/src/redakcja/settings/__init__.py
+++ b/src/redakcja/settings/__init__.py
@@ -38,7 +38,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
 
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
 
     'django.contrib.auth.middleware.AuthenticationMiddleware',

-    'django_cas.middleware.CASMiddleware',
+    'django_cas_ng.middleware.CASMiddleware',

 
     'django.contrib.admindocs.middleware.XViewMiddleware',
     'fnp_django_pagination.middleware.PaginationMiddleware',
 
     'django.contrib.admindocs.middleware.XViewMiddleware',
     'fnp_django_pagination.middleware.PaginationMiddleware',


@@ -52,7 +52,7 @@ if DEBUG:
 
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
 
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',

-    'fnpdjango.auth_backends.AttrCASBackend',
+    'django_cas_ng.backends.CASBackend',

 )
 
 ROOT_URLCONF = 'redakcja.urls'
 )
 
 ROOT_URLCONF = 'redakcja.urls'


@@ -72,9 +72,9 @@ INSTALLED_APPS = (
     'fnp_django_pagination',
     'django_gravatar',
     'fileupload',
     'fnp_django_pagination',
     'django_gravatar',
     'fileupload',

-    'kombu.transport.django',

     'pipeline',
     'fnpdjango',
     'pipeline',
     'fnpdjango',

+    'django_cas_ng',

 
     'catalogue',
     'cover',
 
     'catalogue',
     'cover',


@@ -91,10 +91,6 @@ if DEBUG:
 
 LOGIN_REDIRECT_URL = '/documents/user'
 
 
 LOGIN_REDIRECT_URL = '/documents/user'
 

-CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
-CELERY_SEND_TASK_ERROR_EMAILS = True
-CELERY_ACCEPT_CONTENT = ['pickle']  # Remove when all tasks jsonable.
-

 MIN_COVER_SIZE = (915, 1270)
 
 STATICFILES_FINDERS = (
 MIN_COVER_SIZE = (915, 1270)
 
 STATICFILES_FINDERS = (