Towards easier deployment.

diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py
index aa50736..918bed9 100644 (file)
--- a/src/wolnelektury/settings/basic.py
+++ b/src/wolnelektury/settings/basic.py
@@ -1,8 +1,7 @@
 # This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Wolne Lektury. 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
 
 
 DEBUG = True
 


@@ -14,15 +13,17 @@ MANAGERS = ADMINS
 
 CONTACT_EMAIL = 'fundacja@wolnelektury.pl'
 
 
 CONTACT_EMAIL = 'fundacja@wolnelektury.pl'
 

+ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', '').split()
+

 CACHE_MIDDLEWARE_SECONDS = 3 * 60
 
 DATABASES = {
     'default': {
 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'),

     }
 }
 
     }
 }
 

diff --git a/src/wolnelektury/settings/custom.py b/src/wolnelektury/settings/custom.py
index 027eca9..856de5a 100644 (file)
--- a/src/wolnelektury/settings/custom.py
+++ b/src/wolnelektury/settings/custom.py
@@ -22,7 +22,8 @@ LIBRARIAN_PDF_MOREFLOATS = None
 
 LATEST_BLOG_POSTS = "https://fundacja.wolnelektury.pl/feed/?cat=-135"
 
 
 LATEST_BLOG_POSTS = "https://fundacja.wolnelektury.pl/feed/?cat=-135"
 

-CATALOGUE_COUNTERS_FILE = os.path.join(VAR_DIR, 'catalogue_counters.p')
+CATALOGUE_COUNTERS_FILE = os.path.join(VAR_DIR, 'counters/catalogue_counters.p')
+LESMIANATOR_PICKLE = os.path.join(VAR_DIR, 'counters/lesmianator.p')

 
 CATALOGUE_MIN_INITIALS = 60
 
 
 CATALOGUE_MIN_INITIALS = 60