X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/de25649c03f4d7d476bf8764ba8671681bfd6324..031b8be3bf03baa724dd7e225b0555726d089341:/src/wolnelektury/settings/basic.py diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py index 4e21244d8..11eb7cfe4 100644 --- a/src/wolnelektury/settings/basic.py +++ b/src/wolnelektury/settings/basic.py @@ -2,11 +2,9 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from os import path -from machina import MACHINA_MAIN_TEMPLATE_DIR from .paths import PROJECT_DIR DEBUG = True -MAINTENANCE_MODE = False ADMINS = [ # ('Your Name', 'your_email@domain.com'), @@ -16,6 +14,8 @@ MANAGERS = ADMINS CONTACT_EMAIL = 'fundacja@nowoczesnapolska.org.pl' +CACHE_MIDDLEWARE_SECONDS = 24 * 60 * 60 + DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', # 'postgresql_psycopg2' @@ -26,6 +26,8 @@ DATABASES = { } } +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + SOLR_TEST = "http://localhost:8983/solr/wl_test/" SOLR_STOPWORDS = "/path/to/solr/data/conf/lang/stopwords_pl.txt" @@ -41,17 +43,8 @@ SITE_ID = 1 TEMPLATES = [{ 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': ( - path.join(PROJECT_DIR, 'templates'), # Duplicate, because of Machina<1 weird configuration. - MACHINA_MAIN_TEMPLATE_DIR, - ), + 'APP_DIRS': True, 'OPTIONS': { - 'loaders': ( - ('django.template.loaders.cached.Loader', ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', - )), - ), 'context_processors': ( 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', @@ -61,7 +54,6 @@ TEMPLATES = [{ 'django.template.context_processors.request', 'wolnelektury.context_processors.extra_settings', 'search.context_processors.search_form', - 'machina.core.context_processors.metadata', ), }, }] @@ -76,12 +68,11 @@ MIDDLEWARE = [ 'django.contrib.admindocs.middleware.XViewMiddleware', 'fnp_django_pagination.middleware.PaginationMiddleware', 'django.middleware.locale.LocaleMiddleware', - 'maintenancemode.middleware.MaintenanceModeMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'fnpdjango.middleware.SetRemoteAddrFromXRealIP', 'django.middleware.cache.FetchFromCacheMiddleware', - 'machina.apps.forum_permission.middleware.ForumPermissionMiddleware', + 'experiments.middleware.experiments_middleware', ] ROOT_URLCONF = 'wolnelektury.urls'