From cdf8c20a0774bc1ed0deee68e8b6fd121c539619 Mon Sep 17 00:00:00 2001 From: pedro Date: Thu, 29 Feb 2024 20:46:31 +0100 Subject: [PATCH] bugfix domain env vars see https://gitea.pangea.org/trustchain-oc1-orchestral/IdHub/issues/141 --- docker-compose__instance-autotest-pair.yml | 4 ++-- docker-compose__instance-autotest.yml | 2 +- docker-compose__instance-nightly.yml | 2 +- docker-compose__pilot-generic.yml | 2 +- docker-compose__pilot-lafede.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose__instance-autotest-pair.yml b/docker-compose__instance-autotest-pair.yml index cdbd632..3657d5a 100644 --- a/docker-compose__instance-autotest-pair.yml +++ b/docker-compose__instance-autotest-pair.yml @@ -18,7 +18,7 @@ services: - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} - - DOMAIN=https://idhub1-autotest.demo.pangea.org + - DOMAIN=idhub1-autotest.demo.pangea.org - CSRF_TRUSTED_ORIGINS=https://idhub1-autotest.demo.pangea.org - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} @@ -54,7 +54,7 @@ services: - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} - - DOMAIN=https://idhub2-autotest.demo.pangea.org + - DOMAIN=idhub2-autotest.demo.pangea.org - CSRF_TRUSTED_ORIGINS=https://idhub2-autotest.demo.pangea.org - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} diff --git a/docker-compose__instance-autotest.yml b/docker-compose__instance-autotest.yml index 3428e1b..c0393f2 100644 --- a/docker-compose__instance-autotest.yml +++ b/docker-compose__instance-autotest.yml @@ -18,7 +18,7 @@ services: - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} - - DOMAIN=https://idhub-autotest.demo.pangea.org + - DOMAIN=idhub-autotest.demo.pangea.org - CSRF_TRUSTED_ORIGINS=https://idhub-autotest.demo.pangea.org - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} diff --git a/docker-compose__instance-nightly.yml b/docker-compose__instance-nightly.yml index 3780dff..1a79a48 100644 --- a/docker-compose__instance-nightly.yml +++ b/docker-compose__instance-nightly.yml @@ -18,7 +18,7 @@ services: - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} - - DOMAIN=https://idhub-nightly.demo.pangea.org + - DOMAIN=idhub-nightly.demo.pangea.org - CSRF_TRUSTED_ORIGINS=https://idhub-nightly.demo.pangea.org - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} diff --git a/docker-compose__pilot-generic.yml b/docker-compose__pilot-generic.yml index 8e8af3a..230bfc1 100644 --- a/docker-compose__pilot-generic.yml +++ b/docker-compose__pilot-generic.yml @@ -16,7 +16,7 @@ services: - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} - - DOMAIN=https://idhub.demo.pangea.org + - DOMAIN=idhub.demo.pangea.org - CSRF_TRUSTED_ORIGINS=https://idhub.demo.pangea.org - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} diff --git a/docker-compose__pilot-lafede.yml b/docker-compose__pilot-lafede.yml index 1fa6d96..177fc32 100644 --- a/docker-compose__pilot-lafede.yml +++ b/docker-compose__pilot-lafede.yml @@ -14,7 +14,7 @@ services: - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} - - DOMAIN=https://idhub1-lafede.demo.pangea.org + - DOMAIN=idhub1-lafede.demo.pangea.org - CSRF_TRUSTED_ORIGINS=https://idhub1-lafede.demo.pangea.org - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST}