X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/ec5b493bff5efa683aadf5f78aa891eff3550156..ed5df159a03b0c3c0d17f9e7be8d925e9e73f669:/redakcja/settings/common.py?ds=sidebyside diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py index 735743db..ccb021e6 100644 --- 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.middleware.doc.XViewMiddleware', + 'django.contrib.admindocs.middleware.XViewMiddleware', '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' @@ -111,11 +111,11 @@ INSTALLED_APPS = ( 'south', 'sorl.thumbnail', 'pagination', - 'gravatar', - 'djcelery', - 'djkombu', + 'django_gravatar', 'fileupload', + 'kombu.transport.django', 'pipeline', + 'fnpdjango', 'catalogue', 'cover', @@ -137,18 +137,15 @@ 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 +MIN_COVER_SIZE = (915, 1270) + try: from redakcja.settings.compress import * except ImportError: