Report fix.

[wolnelektury.git] / src / wolnelektury / settings / basic.py

diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py
index 0f49d6b..c6485d6 100644 (file)
--- a/src/wolnelektury/settings/basic.py
+++ b/src/wolnelektury/settings/basic.py
@@ -1,12 +1,11 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from os import path
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # 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
 from .paths import PROJECT_DIR
 
 DEBUG = False

-TEMPLATE_DEBUG = DEBUG

 MAINTENANCE_MODE = False
 
 ADMINS = [
 MAINTENANCE_MODE = False
 
 ADMINS = [


@@ -15,6 +14,8 @@ ADMINS = [
 
 MANAGERS = ADMINS
 
 
 MANAGERS = ADMINS
 

+CONTACT_EMAIL = 'fundacja@nowoczesnapolska.org.pl'
+

 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',  # 'postgresql_psycopg2'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',  # 'postgresql_psycopg2'


@@ -27,6 +28,7 @@ DATABASES = {
 
 SOLR = "http://localhost:8983/solr/wl/"
 SOLR_TEST = "http://localhost:8983/solr/wl_test/"
 
 SOLR = "http://localhost:8983/solr/wl/"
 SOLR_TEST = "http://localhost:8983/solr/wl_test/"

+SOLR_STOPWORDS = "/path/to/solr/data/conf/lang/stopwords_pl.txt"

 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name


@@ -40,6 +42,10 @@ SITE_ID = 1
 
 TEMPLATES = [{
     'BACKEND': 'django.template.backends.django.DjangoTemplates',
 
 TEMPLATES = [{
     'BACKEND': 'django.template.backends.django.DjangoTemplates',

+    'DIRS': (
+        path.join(PROJECT_DIR, 'templates'),  # Duplicate, because of Machina<1 weird configuration.
+        MACHINA_MAIN_TEMPLATE_DIR,
+    ),

     'OPTIONS': {
         'loaders': (
             ('django.template.loaders.cached.Loader', (
     'OPTIONS': {
         'loaders': (
             ('django.template.loaders.cached.Loader', (


@@ -49,12 +55,33 @@ TEMPLATES = [{
         ),
         'context_processors': (
             'django.contrib.auth.context_processors.auth',
         ),
         'context_processors': (
             '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',
+            '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',
             'wolnelektury.context_processors.extra_settings',
             'search.context_processors.search_form',

+            'machina.core.context_processors.metadata',

         ),
     },
 }]
         ),
     },
 }]

+
+MIDDLEWARE = [
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.middleware.cache.UpdateCacheMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    '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',
+]
+
+ROOT_URLCONF = 'wolnelektury.urls'