X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/80ab7c8128a710975c5d705278f01d74de557ee7..a1e5a5980a2354b855e79479701c5198884f7d5f:/wolnelektury/settings/__init__.py?ds=inline

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index ed7bda0f4..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'
@@ -53,7 +54,6 @@ INSTALLED_APPS_OUR = [
     'dictionary',
     'infopages',
     'lesmianator',
-    #'lessons',
     'newtagging',
     'opds',
     'pdcounter',
@@ -65,6 +65,7 @@ INSTALLED_APPS_OUR = [
     'social',
     'waiter',
     'search',
+    'oai',
     ]
 
 INSTALLED_APPS_CONTRIB = [
@@ -75,7 +76,9 @@ INSTALLED_APPS_CONTRIB = [
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
+    'django.contrib.staticfiles',
     'pagination',
+    'pipeline',
     'piston',
     'piwik.django',
     #'rosetta',
@@ -84,7 +87,7 @@ INSTALLED_APPS_CONTRIB = [
     'djcelery',
     'djkombu',
     'honeypot',
-    #    'django_nose',
+    #'django_nose',
 
     #allauth stuff
     'emailconfirmation',
@@ -97,7 +100,6 @@ INSTALLED_APPS_CONTRIB = [
     #'allauth.twitter',
 
     # included
-    'compress',
     'modeltranslation',
     ]
 
@@ -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
-