From 5915a2a0148ffb4595292e3c5dd6661cb94f1bd7 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 28 Feb 2025 14:55:03 +0100 Subject: [PATCH] adapt configuration for multiple domains and prod odoo --- deployment/deployment.yaml | 10 +++++----- hub/settings.py | 13 +++++++++++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/deployment/deployment.yaml b/deployment/deployment.yaml index 7b5757e..7ecbe49 100644 --- a/deployment/deployment.yaml +++ b/deployment/deployment.yaml @@ -26,19 +26,19 @@ spec: - name: DEBUG value: "false" - name: ALLOWED_HOSTS - value: poc.serva.la + value: poc.serva.la,www.serva.la,serva.la - name: DB_FILE value: /data/servala.db - name: ODOO_URL - value: https://test.central.vshn.ch + value: https://central.vshn.ch - name: ODOO_LEAD_CAMPAIGN_ID - value: "6" + value: "101" - name: ODOO_LEAD_SOURCE_ID - value: "28" + value: 703" - name: ODOO_LEAD_MEDIUM_ID value: "1" - name: ODOO_LEAD_TAG_ID - value: "6" + value: "43" envFrom: - secretRef: name: servala diff --git a/hub/settings.py b/hub/settings.py index a764c0b..d173c76 100644 --- a/hub/settings.py +++ b/hub/settings.py @@ -41,10 +41,19 @@ SECRET_KEY = env.str("SECRET_KEY") # SECURITY WARNING: don't run with debug turned on in production! DEBUG = env.bool("DEBUG", default=False) +# Get all allowed hosts ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default=[]) -CSRF_TRUSTED_ORIGINS = [f"https://{h}" for h in ALLOWED_HOSTS] -WEBSITE_URL = env.str("WEBSITE_URL", default="https://poc.serva.la") +# Flexible CSRF handling - support both HTTP and HTTPS as needed +HTTP_HOSTS = env.list("HTTP_HOSTS", default=[]) +HTTPS_HOSTS = env.list("HTTPS_HOSTS", default=ALLOWED_HOSTS) + +CSRF_TRUSTED_ORIGINS = [f"https://{h}" for h in HTTPS_HOSTS] + [ + f"http://{h}" for h in HTTP_HOSTS +] + +# Primary website URL +WEBSITE_URL = env.str("WEBSITE_URL", default="https://serva.la") # Application definition