X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/15dec706694c3afc006713be0fabb4973a6c2946..06e460b91c23f11e92bf5ae711a4ed2226d3a0c7:/src/redakcja/settings/__init__.py?ds=sidebyside diff --git a/src/redakcja/settings/__init__.py b/src/redakcja/settings/__init__.py index b9bdf5dd..5aca7f7d 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__))) @@ -72,7 +72,6 @@ INSTALLED_APPS = ( 'fnp_django_pagination', 'django_gravatar', 'fileupload', - 'kombu.transport.django', 'pipeline', 'fnpdjango', @@ -91,10 +90,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 = (