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 8403688..4f61940 100644 (file)
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@ -26,20 +26,21 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 )
 
 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',
     'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
     'django.contrib.messages.middleware.MessageMiddleware',
     'fnpdjango.middleware.SetRemoteAddrFromXRealIP',

+    'django.middleware.cache.FetchFromCacheMiddleware',

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


@@ -68,14 +69,18 @@ INSTALLED_APPS_OUR = [
     'search',
     'oai',
     'funding',
     'search',
     'oai',
     'funding',

+    'polls',
+    'libraries',

     ]
 
 GETPAID_BACKENDS = (
     ]
 
 GETPAID_BACKENDS = (

-    'getpaid.backends.dummy',

     'getpaid.backends.payu',
 )
 
 INSTALLED_APPS_CONTRIB = [
     'getpaid.backends.payu',
 )
 
 INSTALLED_APPS_CONTRIB = [

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

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


@@ -87,18 +92,14 @@ 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',
     'fnpdjango',
     'getpaid',

-    'getpaid.backends.dummy',

     'getpaid.backends.payu',
     'getpaid.backends.payu',

+    'ssify',

 
     #allauth stuff
     'uni_form',
 
     #allauth stuff
     'uni_form',


@@ -108,9 +109,6 @@ INSTALLED_APPS_CONTRIB = [
     'allauth.socialaccount.providers.openid',
     'allauth.socialaccount.providers.facebook',
     #'allauth.socialaccount.providers.twitter',
     'allauth.socialaccount.providers.openid',
     'allauth.socialaccount.providers.facebook',
     #'allauth.socialaccount.providers.twitter',

-
-    # included
-    'modeltranslation',

     ]
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB
     ]
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB