undo wrong changes

[redakcja.git] / redakcja / settings / common.py

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 4565fe4..5146dcd 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -79,14 +79,14 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django_cas.middleware.CASMiddleware',
 
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django_cas.middleware.CASMiddleware',
 

-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',

     'pagination.middleware.PaginationMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
 )
 
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
     'pagination.middleware.PaginationMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
 )
 
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',

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

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


@@ -111,16 +111,17 @@ INSTALLED_APPS = (
     'south',
     'sorl.thumbnail',
     'pagination',
     'south',
     'sorl.thumbnail',
     'pagination',

-    'gravatar',
-    'djcelery',
-    'djkombu',
+    'django_gravatar',

     'fileupload',
     'fileupload',

+    'kombu.transport.django',

     'pipeline',
     'pipeline',

+    'fnpdjango',

 
     'catalogue',
     'cover',
     'dvcs',
     'wiki',
 
     'catalogue',
     'cover',
     'dvcs',
     'wiki',

+    'wiki_img',

     'toolbar',
     'apiclient',
     'email_mangler',
     'toolbar',
     'apiclient',
     'email_mangler',


@@ -136,15 +137,10 @@ CAS_USER_ATTRS_MAP = {
 IMAGE_DIR = 'images/'
 
 
 IMAGE_DIR = 'images/'
 
 

-import djcelery
-djcelery.setup_loader()
-
-BROKER_BACKEND = "djkombu.transport.DatabaseTransport"
-BROKER_HOST = "localhost"
-BROKER_PORT = 5672
-BROKER_USER = "guest"
-BROKER_PASSWORD = "guest"
-BROKER_VHOST = "/"
+BROKER_URL = 'django://'
+CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
+CELERY_SEND_TASK_ERROR_EMAILS = True
+CELERY_ACCEPT_CONTENT = ['pickle']  # Remove when all tasks jsonable.

 
 SHOW_APP_VERSION = False
 
 
 SHOW_APP_VERSION = False