Using cache middleware instead of various caching micro-strategies,

[wolnelektury.git] / wolnelektury / settings / __init__.py

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index de1b442..4f61940 100644 (file)
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@ -2,14 +2,14 @@
 # Django settings for wolnelektury project.
 from os import path
 
 # 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 = (
 
 
 TEMPLATE_CONTEXT_PROCESSORS = (


@@ -20,24 +20,27 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'wolnelektury_core.context_processors.extra_settings',
     'search.context_processors.search_form',
     '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.account.context_processors.account",

+    "allauth.socialaccount.context_processors.socialaccount",

 )
 
 MIDDLEWARE_CLASSES = [
 )
 
 MIDDLEWARE_CLASSES = [

+    'django.middleware.csrf.CsrfViewMiddleware',
+    'ssify.middleware.SsiMiddleware',

     'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.cache.UpdateCacheMiddleware',

+    'ssify.middleware.PrepareForCacheMiddleware',

     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

-    'django.middleware.csrf.CsrfViewMiddleware',

     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',

-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',

     'pagination.middleware.PaginationMiddleware',
     'pagination.middleware.PaginationMiddleware',

-    'django.middleware.locale.LocaleMiddleware',
-    'piwik.django.middleware.PiwikMiddleware',
+    'ssify.middleware.LocaleMiddleware',

     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',

-    'django.middleware.cache.FetchFromCacheMiddleware',

     'django.contrib.messages.middleware.MessageMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',

+    'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
+    'django.middleware.cache.FetchFromCacheMiddleware',

 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'
 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'


@@ -65,9 +68,19 @@ INSTALLED_APPS_OUR = [
     'waiter',
     'search',
     'oai',
     'waiter',
     'search',
     'oai',

+    'funding',
+    'polls',
+    'libraries',

     ]
 
     ]
 

+GETPAID_BACKENDS = (
+    'getpaid.backends.payu',
+)
+

 INSTALLED_APPS_CONTRIB = [
 INSTALLED_APPS_CONTRIB = [

+    # Should be before django.contrib.admin
+    'modeltranslation',
+

     # external
     'django.contrib.auth',
     'django.contrib.contenttypes',
     # external
     'django.contrib.auth',
     'django.contrib.contenttypes',


@@ -79,34 +92,29 @@ INSTALLED_APPS_CONTRIB = [
     'pagination',
     'pipeline',
     'piston',
     'pagination',
     'pipeline',
     'piston',

-    'piwik.django',
-    #'rosetta',
-    'south',
+    'piwik',

     'sorl.thumbnail',
     'sorl.thumbnail',

-    'djcelery',
-    'djkombu',
+    'kombu.transport.django',

     'honeypot',
     'honeypot',

-    'django_nose',
+    'fnpdjango',
+    'getpaid',
+    'getpaid.backends.payu',
+    'ssify',

 
     #allauth stuff
 
     #allauth stuff

-    'emailconfirmation',

     'uni_form',
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
     'uni_form',
     'allauth',
     'allauth.account',
     'allauth.socialaccount',

-    'allauth.openid',
-    #'allauth.facebook',
-    #'allauth.twitter',
-
-    # included
-    'modeltranslation',
+    'allauth.socialaccount.providers.openid',
+    'allauth.socialaccount.providers.facebook',
+    #'allauth.socialaccount.providers.twitter',

     ]
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB
 
 # Load localsettings, if they exist
 try:
     ]
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB
 
 # Load localsettings, if they exist
 try:

-    from localsettings import *
+    from wolnelektury.localsettings import *

 except ImportError:
     pass
 except ImportError:
     pass

-