From 1ac1bf0a2a19355aa9c438b75b9d24a6d2936371 Mon Sep 17 00:00:00 2001 From: pedro Date: Mon, 18 Mar 2024 21:24:50 +0100 Subject: [PATCH] pilot setem: adjust to new vars --- docker-compose__pilot-setem.yml | 36 +++++++++------------------------ 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/docker-compose__pilot-setem.yml b/docker-compose__pilot-setem.yml index 2f7e529..3822849 100644 --- a/docker-compose__pilot-setem.yml +++ b/docker-compose__pilot-setem.yml @@ -5,21 +5,13 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: - - DEBUG=true - - ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} - - CREATE_TEST_USERS=true - # when enabling this pilot for its end users - # ADMIN_EMAIL=IDHUB_PILOT_XO9B_IDHUB1__ADMIN_EMAIL - # TODO destroy CREATE_TEST_USERS=true + - DOMAIN=idhub1-setem.demo.pangea.org + - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} + - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} - SECRET_KEY=${IDHUB_SECRET_KEY:-publicsecretisnotsecureVtmKBfxpVV47PpBCF2Nzz2H6qnbd} - - ALLOWED_HOSTS=${IDHUB_ALLOWED_HOSTS:-*} - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} - PORT=${IDHUB_PORT:-9001} - - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} - - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} - - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} - - CSRF_TRUSTED_ORIGINS=https://idhub1-setem.demo.pangea.org - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} @@ -27,10 +19,10 @@ services: - EMAIL_PORT=${IDHUB_EMAIL_PORT} - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS} - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND} - - RESPONSE_URI=https://idhub1-setem.demo.pangea.org/oidc4vp/ - SUPPORTED_CREDENTIALS=['MembershipCard'] - SYNC_ORG_DEV=${IDHUB_SYNC_ORG_DEV} - - ORG_FILE=examples/organizations__pilot_setem.csv + - OIDC_ORGS=examples/organizations__pilot_setem.csv + - OIDC_REDIRECT=false ports: - 9011:9001 volumes: @@ -41,21 +33,13 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: - - DEBUG=true - - ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} - - CREATE_TEST_USERS=true - # when enabling this pilot for its end users - # ADMIN_EMAIL=IDHUB_PILOT_XO9B_IDHUB1__ADMIN_EMAIL - # TODO destroy CREATE_TEST_USERS=true + - DOMAIN=idhub2-setem.demo.pangea.org + - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} + - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} - SECRET_KEY=${IDHUB_SECRET_KEY:-publicsecretisnotsecureVtmKBfxpVV47PpBCF2Nzz2H6qnbd} - - ALLOWED_HOSTS=${IDHUB_ALLOWED_HOSTS:-*} - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} - PORT=${IDHUB_PORT:-9002} - - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} - - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} - - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} - - CSRF_TRUSTED_ORIGINS=https://idhub2-setem.demo.pangea.org - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} @@ -63,10 +47,10 @@ services: - EMAIL_PORT=${IDHUB_EMAIL_PORT} - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS} - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND} - - RESPONSE_URI=https://idhub2-setem.demo.pangea.org/oidc4vp/ - SUPPORTED_CREDENTIALS=['MembershipCard'] - SYNC_ORG_DEV=${IDHUB_SYNC_ORG_DEV} - - ORG_FILE=examples/organizations__pilot_setem.csv + - OIDC_ORGS=examples/organizations__pilot_setem.csv + - OIDC_REDIRECT=false ports: - 9012:9002 volumes: