From 691863b78e24a8a34d1b00c78c7fb3c8ed31184f Mon Sep 17 00:00:00 2001 From: Sajeyks Date: Wed, 30 Sep 2026 16:35:15 +0300 Subject: [PATCH] Keep required settings strict and supply their dev values in .env.docker --- .env.docker | 9 ++++++++- dynamicweb/settings/base.py | 10 +++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.env.docker b/.env.docker index 35463a90..717b5809 100644 --- a/.env.docker +++ b/.env.docker @@ -31,6 +31,12 @@ STRIPE_API_PRIVATE_KEY= STRIPE_API_PUBLIC_KEY= STRIPE_API_PRIVATE_KEY_TEST= +# Values the settings require; the app has no defaults for them +LDAP_CUSTOMER_GROUP_ID=0 +LDAP_DEFAULT_START_UID=10000 +PRE_EU_VAT_RATE=0 +VM_BASE_PRICE=0 + # OpenNebula / LDAP are not available in the test env OPENNEBULA_USERNAME=oneadmin OPENNEBULA_PASSWORD=opennebula @@ -40,7 +46,8 @@ OPENNEBULA_DOMAIN=test_domain OPENNEBULA_PORT=2633 OPENNEBULA_ENDPOINT=/RPC2 -# Create dummy pages/users on start (idempotent). Set to False to turn off; +# Create sample pages/users on start, only into a database without page content +# (idempotent). Set to False to turn off; # remove existing dummy data with: docker compose exec web python manage.py seed_dummy_data --purge SEED_DUMMY_DATA=True # Fixed dev login: dummy-admin@example.com / this password diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 33213e73..8bd24bd5 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -569,7 +569,7 @@ STRIPE_API_PRIVATE_KEY_TEST = env('STRIPE_API_PRIVATE_KEY_TEST') ANONYMOUS_USER_NAME = 'anonymous@ungleich.ch' GUARDIAN_GET_INIT_ANONYMOUS_USER = 'membership.models.get_anonymous_user_instance' -UNGLEICH_SITE_CONFIGS = env('UNGLEICH_SITE_CONFIGS', '') +UNGLEICH_SITE_CONFIGS = env('UNGLEICH_SITE_CONFIGS') MULTISITE_CMS_URLS = {} if UNGLEICH_SITE_CONFIGS == "": @@ -742,11 +742,11 @@ LDAP_ADMIN_PASSWORD = env('LDAP_ADMIN_PASSWORD') AUTH_LDAP_SERVER = env('LDAPSERVER') LDAP_CUSTOMER_DN = env('LDAP_CUSTOMER_DN') -LDAP_CUSTOMER_GROUP_ID = int(env('LDAP_CUSTOMER_GROUP_ID', 0)) +LDAP_CUSTOMER_GROUP_ID = int(env('LDAP_CUSTOMER_GROUP_ID')) LDAP_MAX_UID_FILE_PATH = os.environ.get('LDAP_MAX_UID_FILE_PATH', os.path.join(os.path.abspath(os.path.dirname(__file__)), 'ldap_max_uid_file') ) -LDAP_DEFAULT_START_UID = int(env('LDAP_DEFAULT_START_UID', 10000)) +LDAP_DEFAULT_START_UID = int(env('LDAP_DEFAULT_START_UID')) # Search union over OUs AUTH_LDAP_START_TLS = bool(os.environ.get('LDAP_USE_TLS', False)) @@ -768,9 +768,9 @@ OTP_SERVER = env('OTP_SERVER') OTP_VERIFY_ENDPOINT = env('OTP_VERIFY_ENDPOINT') FIRST_VM_ID_AFTER_EU_VAT = int_env('FIRST_VM_ID_AFTER_EU_VAT') -PRE_EU_VAT_RATE = float(env('PRE_EU_VAT_RATE', 0)) +PRE_EU_VAT_RATE = float(env('PRE_EU_VAT_RATE')) -VM_BASE_PRICE = float(env('VM_BASE_PRICE', 0)) +VM_BASE_PRICE = float(env('VM_BASE_PRICE')) UPDATED_TEMPLATES_STR = env('UPDATED_TEMPLATES') UPDATED_TEMPLATES_DICT = {}