X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/15dec706694c3afc006713be0fabb4973a6c2946..040285e94b385dd57a003a4fe5b693c299fe921b:/src/redakcja/settings/__init__.py?ds=sidebyside

diff --git a/src/redakcja/settings/__init__.py b/src/redakcja/settings/__init__.py
index b9bdf5dd..99097547 100644
--- a/src/redakcja/settings/__init__.py
+++ b/src/redakcja/settings/__init__.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 import os.path
-from redakcja.settings.defaults import *
-from redakcja.localsettings import *
-
+from .defaults import *
+from ..localsettings import *
+import os
 
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
 
@@ -38,7 +38,7 @@ MIDDLEWARE_CLASSES = (
     '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',
@@ -52,7 +52,7 @@ if DEBUG:
 
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
-    'fnpdjango.auth_backends.AttrCASBackend',
+    'django_cas_ng.backends.CASBackend',
 )
 
 ROOT_URLCONF = 'redakcja.urls'
@@ -72,9 +72,9 @@ INSTALLED_APPS = (
     'fnp_django_pagination',
     'django_gravatar',
     'fileupload',
-    'kombu.transport.django',
     'pipeline',
     'fnpdjango',
+    'django_cas_ng',
 
     'catalogue',
     'cover',
@@ -91,10 +91,6 @@ if DEBUG:
 
 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 = (