dont use celery to index - seems it gets blocked on index file access

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index e476d13..afd42e9 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -60,6 +60,7 @@ USE_I18N = True
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = path.join(PROJECT_DIR, '../media')
 STATIC_ROOT = path.join(PROJECT_DIR, 'static')
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = path.join(PROJECT_DIR, '../media')
 STATIC_ROOT = path.join(PROJECT_DIR, 'static')

+SEARCH_INDEX = path.join(MEDIA_ROOT, 'search')

 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).


@@ -88,6 +89,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.media',
     'django.core.context_processors.request',
     'wolnelektury.context_processors.extra_settings',
     'django.core.context_processors.media',
     'django.core.context_processors.request',
     'wolnelektury.context_processors.extra_settings',

+    'search.context_processors.search_form',

 )
 
 MIDDLEWARE_CLASSES = [
 )
 
 MIDDLEWARE_CLASSES = [


@@ -153,10 +155,12 @@ INSTALLED_APPS = [
     'stats',
     'suggest',
     'picture',
     'stats',
     'suggest',
     'picture',

+    'search',

 ]
 
 #CACHE_BACKEND = 'locmem:///?max_entries=3000'
 ]
 
 #CACHE_BACKEND = 'locmem:///?max_entries=3000'

-#CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
+CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
+#CACHE_BACKEND = None

 CACHE_MIDDLEWARE_ANONYMOUS_ONLY=True
 
 # CSS and JavaScript file groups
 CACHE_MIDDLEWARE_ANONYMOUS_ONLY=True
 
 # CSS and JavaScript file groups


@@ -174,6 +178,8 @@ COMPRESS_CSS = {
             'css/book_box.css',
             'css/catalogue.css',
             'css/sponsors.css',
             'css/book_box.css',
             'css/catalogue.css',
             'css/sponsors.css',

+            
+            'css/ui-lightness/jquery-ui-1.8.16.custom.css',

         ],
         'output_filename': 'css/all.min?.css',
     },
         ],
         'output_filename': 'css/all.min?.css',
     },


@@ -181,6 +187,12 @@ COMPRESS_CSS = {
         'source_filenames': ('css/master.book.css',),
         'output_filename': 'css/book.min?.css',
     },
         'source_filenames': ('css/master.book.css',),
         'output_filename': 'css/book.min?.css',
     },

+    'player': {
+        'source_filenames': [
+            'jplayer/jplayer.blue.monday.css', 
+        ],
+        'output_filename': 'css/player.min?.css',
+    },

     'simple': {
         'source_filenames': ('css/simple.css',),
         'output_filename': 'css/simple.min?.css',
     'simple': {
         'source_filenames': ('css/simple.css',),
         'output_filename': 'css/simple.min?.css',


@@ -198,26 +210,36 @@ COMPRESS_JS = {
             'js/jquery.countdown-es.js', 'js/jquery.countdown-lt.js',
             'js/jquery.countdown-ru.js', 'js/jquery.countdown-fr.js',
 
             'js/jquery.countdown-es.js', 'js/jquery.countdown-lt.js',
             'js/jquery.countdown-ru.js', 'js/jquery.countdown-fr.js',
 

+            'js/jquery-ui-1.8.16.custom.min.js',
+

             'js/locale.js',
             'js/dialogs.js',
             'js/sponsors.js',
             'js/locale.js',
             'js/dialogs.js',
             'js/sponsors.js',

+            'js/base.js',

             'js/pdcounter.js',
 
             'js/pdcounter.js',
 

-            #~ 'js/jquery.autocomplete.js',
-            #~ 'js/jquery.labelify.js', 'js/catalogue.js',
+            'js/search.js',
+
+            'js/jquery.labelify.js',

             ),
         'output_filename': 'js/base?.min.js',
     },
             ),
         'output_filename': 'js/base?.min.js',
     },

-    #~ 'book': {
-        #~ 'source_filenames': ('js/jquery.eventdelegation.js', 'js/jquery.scrollto.js', 'js/jquery.highlightfade.js', 'js/book.js',),
-        #~ 'source_filenames': [],
-        #~ 'output_filename': 'js/book?.min.js',
-    #~ },
-    #~ 'book_ie': {
-        #~ 'source_filenames': ('js/ierange-m2.js',),
-        #~ 'source_filenames': [],
-        #~ 'output_filename': 'js/book_ie?.min.js',
-    #~ }
+    'player': {
+        'source_filenames': [
+            'jplayer/jquery.jplayer.min.js', 
+            'jplayer/jplayer.playlist.min.js', 
+            'js/player.js', 
+        ],
+        'output_filename': 'js/player.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',
+    }

 
 }
 
 
 }
 


@@ -249,13 +271,15 @@ MAX_TAG_LIST = 6
 NO_BUILD_EPUB = False
 NO_BUILD_TXT = False
 NO_BUILD_PDF = False
 NO_BUILD_EPUB = False
 NO_BUILD_TXT = False
 NO_BUILD_PDF = False

-NO_BUILD_MOBI = False
+NO_BUILD_MOBI = True
+NO_SEARCH_INDEX = False

 
 ALL_EPUB_ZIP = 'wolnelektury_pl_epub'
 ALL_PDF_ZIP = 'wolnelektury_pl_pdf'
 ALL_MOBI_ZIP = 'wolnelektury_pl_mobi'
 
 CATALOGUE_DEFAULT_LANGUAGE = 'pol'
 
 ALL_EPUB_ZIP = 'wolnelektury_pl_epub'
 ALL_PDF_ZIP = 'wolnelektury_pl_pdf'
 ALL_MOBI_ZIP = 'wolnelektury_pl_mobi'
 
 CATALOGUE_DEFAULT_LANGUAGE = 'pol'

+PUBLISH_PLAN_FEED = 'http://redakcja.wolnelektury.pl/documents/track/editor-proofreading/'

 
 PAGINATION_INVALID_PAGE_RAISES_404 = True
 
 
 PAGINATION_INVALID_PAGE_RAISES_404 = True
 


@@ -270,6 +294,7 @@ BROKER_PASSWORD = "guest"
 BROKER_VHOST = "/"
 
 
 BROKER_VHOST = "/"
 
 

+

 # Load localsettings, if they exist
 try:
     from localsettings import *
 # Load localsettings, if they exist
 try:
     from localsettings import *