Another upgrade.

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

diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py
index 006e9e0..29c882b 100644 (file)
--- 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 = 3 * 60
 
 DATABASES = {
     'default': {
@@ -26,9 +26,7 @@ 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"
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -42,31 +40,22 @@ 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',
     'django.middleware.cache.UpdateCacheMiddleware',
@@ -76,12 +65,13 @@ MIDDLEWARE_CLASSES = [
     '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'
+
+FILE_UPLOAD_PERMISSIONS = 0o640