Fix social login + newsletter form.

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

diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py
index 006e9e0..ed80fee 100644 (file)
--- a/src/wolnelektury/settings/basic.py
+++ b/src/wolnelektury/settings/basic.py
@@ -5,8 +5,7 @@ from os import path
 from machina import MACHINA_MAIN_TEMPLATE_DIR
 from .paths import PROJECT_DIR
 
 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'),
 
 ADMINS = [
     # ('Your Name', 'your_email@domain.com'),


@@ -26,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"
 


@@ -55,18 +53,20 @@ TEMPLATES = [{
         ),
         'context_processors': (
             'django.contrib.auth.context_processors.auth',
         ),
         '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',
             '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',

+            'wolnelektury.abtests.context_processor',

             'search.context_processors.search_form',
             'machina.core.context_processors.metadata',
         ),
     },
 }]
 
             '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',
     'debug_toolbar.middleware.DebugToolbarMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.middleware.cache.UpdateCacheMiddleware',


@@ -76,7 +76,6 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.admindocs.middleware.XViewMiddleware',
     'fnp_django_pagination.middleware.PaginationMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     '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.common.CommonMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'fnpdjango.middleware.SetRemoteAddrFromXRealIP',


@@ -85,3 +84,5 @@ MIDDLEWARE_CLASSES = [
 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'
 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'

+
+FILE_UPLOAD_PERMISSIONS = 0o640