X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/07a437ef67ffcad01b83255999d2d7744f994d7f..2f4641a37c242ce97fc3c42d93d80d7f24c442c3:/wolnelektury/settings/__init__.py diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py index 15126b9a4..335b2b1aa 100644 --- a/wolnelektury/settings/__init__.py +++ b/wolnelektury/settings/__init__.py @@ -2,14 +2,14 @@ # Django settings for wolnelektury project. from os import path -from settings.basic import * -from settings.auth import * -from settings.cache import * -from settings.celery import * -from settings.contrib import * -from settings.custom import * -from settings.locale import * -from settings.static import * +from .basic import * +from .auth import * +from .cache import * +from .celery import * +from .contrib import * +from .custom import * +from .locale import * +from .static import * TEMPLATE_CONTEXT_PROCESSORS = ( @@ -38,6 +38,7 @@ MIDDLEWARE_CLASSES = [ 'django.middleware.common.CommonMiddleware', 'django.middleware.cache.FetchFromCacheMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', + 'fnpdjango.middleware.SetRemoteAddrFromXRealIP', ] ROOT_URLCONF = 'wolnelektury.urls' @@ -64,6 +65,7 @@ INSTALLED_APPS_OUR = [ 'social', 'waiter', 'search', + 'oai', ] INSTALLED_APPS_CONTRIB = [ @@ -85,7 +87,7 @@ INSTALLED_APPS_CONTRIB = [ 'djcelery', 'djkombu', 'honeypot', - # 'django_nose', + #'django_nose', #allauth stuff 'emailconfirmation', @@ -105,7 +107,6 @@ INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB # Load localsettings, if they exist try: - from localsettings import * + from wolnelektury.localsettings import * except ImportError: pass -