X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/43116c58e5c56f94ef358a5a17fb13a252e02531..ea7deea0bd4f5ca47a8e6a27f6ab640c594fdf78:/redakcja/settings/common.py diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py index 4565fe4b..0c1a009f 100644 --- a/redakcja/settings/common.py +++ b/redakcja/settings/common.py @@ -86,7 +86,7 @@ MIDDLEWARE_CLASSES = ( AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', - 'django_cas.backends.CASBackend', + 'fnpdjango.auth_backends.AttrCASBackend', ) ROOT_URLCONF = 'redakcja.urls' @@ -111,16 +111,17 @@ INSTALLED_APPS = ( 'south', 'sorl.thumbnail', 'pagination', - 'gravatar', - 'djcelery', - 'djkombu', + 'django_gravatar', 'fileupload', + 'kombu.transport.django', 'pipeline', + 'fnpdjango', 'catalogue', 'cover', 'dvcs', 'wiki', + 'wiki_img', 'toolbar', 'apiclient', 'email_mangler', @@ -136,15 +137,10 @@ CAS_USER_ATTRS_MAP = { 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