From d19997df630599ea19abc7731341c0608b7eaae1 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 1 Oct 2025 16:10:36 +0200 Subject: [PATCH] Towards easier deployment. --- src/wolnelektury/settings/basic.py | 15 ++++++++------- src/wolnelektury/settings/custom.py | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py index aa5073606..918bed916 100644 --- 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. # -from os import path -from .paths import PROJECT_DIR +import os DEBUG = True @@ -14,15 +13,17 @@ MANAGERS = ADMINS CONTACT_EMAIL = 'fundacja@wolnelektury.pl' +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'), } } diff --git a/src/wolnelektury/settings/custom.py b/src/wolnelektury/settings/custom.py index 027eca9c1..856de5a9e 100644 --- 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" -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 -- 2.20.1