X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d52c76021eaf1621b4e55a6eba1df1c0404bd7dd..65147fbaa927dbe48d42897681d8a51d3c709798:/wolnelektury/settings.py diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index 55c845e60..f5c9cf275 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -21,10 +21,10 @@ DATABASES = { 'USER': '', # Not used with sqlite3. 'PASSWORD': '', # Not used with sqlite3. 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. } } + # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. @@ -58,9 +58,9 @@ USE_I18N = True # Absolute path to the directory that holds media. # 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') +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). @@ -77,18 +77,19 @@ ADMIN_MEDIA_PREFIX = '/admin-media/' # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = [ - 'django.template.loaders.filesystem.load_template_source', - 'django.template.loaders.app_directories.load_template_source', -# 'django.template.loaders.eggs.load_template_source', + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', +# 'django.template.loaders.eggs.Loader', ] TEMPLATE_CONTEXT_PROCESSORS = ( - 'django.core.context_processors.auth', + 'django.contrib.auth.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', + 'search.context_processors.search_form', ) MIDDLEWARE_CLASSES = [ @@ -155,11 +156,30 @@ INSTALLED_APPS = [ 'suggest', 'picture', 'search', + 'social', ] -#CACHE_BACKEND = 'locmem:///?max_entries=3000' -CACHE_BACKEND = 'memcached://127.0.0.1:11211/' -#CACHE_BACKEND = None +CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', + 'LOCATION': [ + '127.0.0.1:11211', + ] + }, + 'permanent': { + 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', + 'TIMEOUT': 2419200, + 'LOCATION': [ + '127.0.0.1:11211', + ] + }, + 'api': { + 'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', + 'LOCATION': path.join(PROJECT_DIR, 'django_cache/'), + 'KEY_PREFIX': 'api', + 'TIMEOUT': 86400, + }, +} CACHE_MIDDLEWARE_ANONYMOUS_ONLY=True # CSS and JavaScript file groups @@ -170,6 +190,7 @@ COMPRESS_CSS = { 'css/jquery.countdown.css', 'css/base.css', + 'css/cite.css', 'css/header.css', 'css/main_page.css', 'css/dialogs.css', @@ -177,7 +198,8 @@ COMPRESS_CSS = { 'css/book_box.css', 'css/catalogue.css', 'css/sponsors.css', - + + 'css/social/shelf_tags.css', 'css/ui-lightness/jquery-ui-1.8.16.custom.css', ], 'output_filename': 'css/all.min?.css', @@ -219,8 +241,7 @@ COMPRESS_JS = { 'js/search.js', - #~ 'js/jquery.autocomplete.js', - #~ 'js/jquery.labelify.js', 'js/catalogue.js', + 'js/jquery.labelify.js', ), 'output_filename': 'js/base?.min.js', }, @@ -232,16 +253,14 @@ COMPRESS_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',), - #~ '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', - #~ } + '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', + } } @@ -275,7 +294,6 @@ NO_BUILD_TXT = False NO_BUILD_PDF = False NO_BUILD_MOBI = True NO_SEARCH_INDEX = False -SEARCH_INDEX_PARALLEL = False ALL_EPUB_ZIP = 'wolnelektury_pl_epub' ALL_PDF_ZIP = 'wolnelektury_pl_pdf' @@ -296,7 +314,7 @@ BROKER_USER = "guest" BROKER_PASSWORD = "guest" BROKER_VHOST = "/" - +CELERY_EAGER_PROPAGATES_EXCEPTIONS = True # Load localsettings, if they exist try: