Towards easier deployment.

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

diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py
index 2e3d81d..918bed9 100644 (file)
--- a/src/wolnelektury/settings/basic.py
+++ b/src/wolnelektury/settings/basic.py
@@ -1,8 +1,7 @@
-# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #
-from os import path
-from .paths import PROJECT_DIR
+import os
 
 DEBUG = True
 
@@ -12,25 +11,24 @@ ADMINS = [
 
 MANAGERS = ADMINS
 
-CONTACT_EMAIL = 'fundacja@nowoczesnapolska.org.pl'
+CONTACT_EMAIL = 'fundacja@wolnelektury.pl'
 
-CACHE_MIDDLEWARE_SECONDS = 24 * 60 * 60
+ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', '').split()
+
+CACHE_MIDDLEWARE_SECONDS = 3 * 60
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',  # 'postgresql_psycopg2'
-        'NAME': path.join(PROJECT_DIR, 'dev.db'),
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'ENGINE': 'django.db.backends.postgresql',
+        'HOST': 'db',
+        'USER': os.environ.get('POSTGRES_USER'),
+        'PASSWORD': os.environ.get('POSTGRES_PASSWORD'),
+        'NAME': os.environ.get('POSTGRES_USER'),
     }
 }
 
 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"
-
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
@@ -43,6 +41,7 @@ SITE_ID = 1
 
 TEMPLATES = [{
     'BACKEND': 'django.template.backends.django.DjangoTemplates',
+    'APP_DIRS': True,
     'OPTIONS': {
         'context_processors': (
             'django.contrib.auth.context_processors.auth',
@@ -52,18 +51,9 @@ TEMPLATES = [{
             'django.template.context_processors.media',
             'django.template.context_processors.request',
             'wolnelektury.context_processors.extra_settings',
-            'search.context_processors.search_form',
         ),
-        'loaders': [
-            'django.template.loaders.filesystem.Loader',
-            'django.template.loaders.app_directories.Loader',
-        ],
     },
 }]
-if not DEBUG:
-    TEMPLATES['loaders'] = [
-        ('django.template.loaders.cached.Loader', TEMPLATES['loaders'])
-    ]
 
 MIDDLEWARE = [
     'debug_toolbar.middleware.DebugToolbarMiddleware',