X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/07a437ef67ffcad01b83255999d2d7744f994d7f..4519647fb81cda70bb827de97b0bcedb933ea200:/wolnelektury/settings/__init__.py

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index 15126b9a4..caec10b82 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 = (
@@ -20,12 +20,12 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'wolnelektury_core.context_processors.extra_settings',
     'search.context_processors.search_form',
-    "allauth.context_processors.allauth",
+
     "allauth.account.context_processors.account",
+    "allauth.socialaccount.context_processors.socialaccount",
 )
 
 MIDDLEWARE_CLASSES = [
-    'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -36,8 +36,8 @@ MIDDLEWARE_CLASSES = [
     'piwik.django.middleware.PiwikMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
-    'django.middleware.cache.FetchFromCacheMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
+    'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'
@@ -64,6 +64,8 @@ INSTALLED_APPS_OUR = [
     'social',
     'waiter',
     'search',
+    'oai',
+    'libraries',
     ]
 
 INSTALLED_APPS_CONTRIB = [
@@ -85,17 +87,16 @@ INSTALLED_APPS_CONTRIB = [
     'djcelery',
     'djkombu',
     'honeypot',
-    #    'django_nose',
+    #'django_nose',
 
     #allauth stuff
-    'emailconfirmation',
     'uni_form',
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
-    'allauth.openid',
-    #'allauth.facebook',
-    #'allauth.twitter',
+    'allauth.socialaccount.providers.openid',
+    'allauth.socialaccount.providers.facebook',
+    #'allauth.socialaccount.providers.twitter',
 
     # included
     'modeltranslation',
@@ -105,7 +106,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
-