Simplify transitional files a bit.

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

diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py
index 7990f25..47a2388 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
 
 from .paths import PROJECT_DIR
 

-DEBUG = False
-MAINTENANCE_MODE = False
+DEBUG = True

 
 ADMINS = [
     # ('Your Name', 'your_email@domain.com'),
 
 ADMINS = [
     # ('Your Name', 'your_email@domain.com'),


@@ -14,6 +13,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'


@@ -24,7 +25,6 @@ DATABASES = {
     }
 }
 
     }
 }
 

-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"
 
 SOLR_TEST = "http://localhost:8983/solr/wl_test/"
 SOLR_STOPWORDS = "/path/to/solr/data/conf/lang/stopwords_pl.txt"
 


@@ -40,6 +40,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,32 +53,36 @@ 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.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',
             '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',
     'django.middleware.csrf.CsrfViewMiddleware',

-    'ssify.middleware.SsiMiddleware',

     'django.middleware.cache.UpdateCacheMiddleware',
     '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',
     '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',
     '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'
 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'

+
+FILE_UPLOAD_PERMISSIONS = 0o640