#1414: http301 for old-style tag urls,

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 186f4b6..a472763 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -81,24 +81,27 @@ TEMPLATE_LOADERS = [
 #     'django.template.loaders.eggs.load_template_source',
 ]
 
 #     'django.template.loaders.eggs.load_template_source',
 ]
 

-TEMPLATE_CONTEXT_PROCESSORS = [
+TEMPLATE_CONTEXT_PROCESSORS = (

     'django.core.context_processors.auth',
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'django.core.context_processors.media',
     'django.core.context_processors.request',
     'wolnelektury.context_processors.extra_settings',
     'django.core.context_processors.auth',
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'django.core.context_processors.media',
     'django.core.context_processors.request',
     'wolnelektury.context_processors.extra_settings',

-]
+)

 
 MIDDLEWARE_CLASSES = [
 
 MIDDLEWARE_CLASSES = [

+    'django.middleware.cache.UpdateCacheMiddleware',

     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
     'django.middleware.locale.LocaleMiddleware',

-
+    'piwik.django.middleware.PiwikMiddleware',

     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',

+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.cache.FetchFromCacheMiddleware',

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


@@ -139,9 +142,12 @@ INSTALLED_APPS = [
     'lesmianator',
     'opds',
     'pdcounter',
     'lesmianator',
     'opds',
     'pdcounter',

+    'piwik.django',

 ]
 
 ]
 

-CACHE_BACKEND = 'locmem:///?max_entries=3000'
+#CACHE_BACKEND = 'locmem:///?max_entries=3000'
+CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
+CACHE_MIDDLEWARE_ANONYMOUS_ONLY=True

 
 # CSS and JavaScript file groups
 COMPRESS_CSS = {
 
 # CSS and JavaScript file groups
 COMPRESS_CSS = {


@@ -174,7 +180,12 @@ COMPRESS_JS = {
     'book': {
         'source_filenames': ('js/jquery.eventdelegation.js', 'js/jquery.scrollto.js', 'js/jquery.highlightfade.js', 'js/book.js',),
         'output_filename': 'js/book?.min.js',
     'book': {
         'source_filenames': ('js/jquery.eventdelegation.js', 'js/jquery.scrollto.js', 'js/jquery.highlightfade.js', 'js/book.js',),
         'output_filename': 'js/book?.min.js',

+    },
+    'book_ie': {
+        'source_filenames': ('js/ierange-m2.js',),
+        'output_filename': 'js/book_ie?.min.js',

     }
     }

+

 }
 
 COMPRESS_VERSION = True
 }
 
 COMPRESS_VERSION = True


@@ -199,6 +210,7 @@ TRANSLATION_REGISTRY = "wolnelektury.translation"
 MAX_TAG_LIST = 6
 
 NO_BUILD_EPUB = False
 MAX_TAG_LIST = 6
 
 NO_BUILD_EPUB = False

+NO_BUILD_TXT = False

 
 # Load localsettings, if they exist
 try:
 
 # Load localsettings, if they exist
 try: