X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/16358b72e70a109652609551c0ad89aec28fc58b..6f12caf7d625f0bfffd2b138897fd8c711a6b2f5:/src/wolnelektury/settings/basic.py diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py index e6511abd3..bbf684f35 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 = False -MAINTENANCE_MODE = False +DEBUG = True ADMINS = [ # ('Your Name', 'your_email@domain.com'), @@ -14,7 +12,9 @@ ADMINS = [ MANAGERS = ADMINS -CONTACT_EMAIL = 'fundacja@nowoczesnapolska.org.pl' +CONTACT_EMAIL = 'fundacja@wolnelektury.pl' + +CACHE_MIDDLEWARE_SECONDS = 24 * 60 * 60 DATABASES = { 'default': { @@ -26,7 +26,8 @@ DATABASES = { } } -SOLR = "http://localhost:8983/solr/wl/" +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" @@ -42,48 +43,38 @@ 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', 'django.template.context_processors.debug', 'django.template.context_processors.i18n', 'django.template.context_processors.media', 'django.template.context_processors.request', 'wolnelektury.context_processors.extra_settings', 'search.context_processors.search_form', - 'machina.core.context_processors.metadata', ), }, }] -MIDDLEWARE_CLASSES = [ +MIDDLEWARE = [ 'debug_toolbar.middleware.DebugToolbarMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', - 'ssify.middleware.SsiMiddleware', 'django.middleware.cache.UpdateCacheMiddleware', - 'ssify.middleware.PrepareForCacheMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.admindocs.middleware.XViewMiddleware', 'fnp_django_pagination.middleware.PaginationMiddleware', - 'ssify.middleware.LocaleMiddleware', - 'maintenancemode.middleware.MaintenanceModeMiddleware', + 'django.middleware.locale.LocaleMiddleware', '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' + +FILE_UPLOAD_PERMISSIONS = 0o640