X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/864d45abe5ec985836baf52de168943d25a03be6..30423c0a921a37cc2213e83309d5abe04399ba15:/src/redakcja/settings/__init__.py?ds=inline diff --git a/src/redakcja/settings/__init__.py b/src/redakcja/settings/__init__.py index cc88ab8e..571a9ed2 100644 --- a/src/redakcja/settings/__init__.py +++ b/src/redakcja/settings/__init__.py @@ -31,28 +31,28 @@ TEMPLATES = [ }, ] -MIDDLEWARE_CLASSES = ( +MIDDLEWARE = [ 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', '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', 'maintenancemode.middleware.MaintenanceModeMiddleware', -) +] if DEBUG: - MIDDLEWARE_CLASSES = ( + MIDDLEWARE = [ 'debug_toolbar.middleware.DebugToolbarMiddleware', - ) + MIDDLEWARE_CLASSES + ] + MIDDLEWARE 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 = (