demo 12d -> pilot-xo9b (not tested)

.gitignore

@@ -6,3 +6,6 @@
 django-orchestra
 django-musician
 IdHub
+
+idhub1__pilot-xo9b/
+idhub2__pilot-xo9b/

build__pilot-xo9b.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+set -e
+set -u
+# DEBUG
+set -x
+
+# a wallet and verifier idhub for pilot-xo9b
+main() {
+        deployment="${1:-}"
+
+        # detach on production deployment
+        if [ "${deployment}" = 'prod' ]; then
+                detach='-d'
+        fi
+
+        postfix='pilot-xo9b'
+        local idhub1="idhub1__${postfix}"
+        local idhub2="idhub2__${postfix}"
+
+        # force recreate
+        rm -rf "./${idhub1}" "./${idhub2}"
+
+        # detect if is new
+        if [ ! -f "./${idhub1}" ] && [ ! -f "./${idhub2}" ]; then
+                echo 'Detected new deployment, recreating git repos idhub1 and idhub2'
+                cp -rp IdHub "${idhub1}"
+                rm -f "${idhub1}/db.sqlite3"
+                cp -rp IdHub "${idhub2}"
+                rm -f "${idhub2}/db.sqlite3"
+        fi
+
+        (
+                cd ./IdHub
+                git checkout pilot-xo9b
+        )
+
+        idhub_dc_f="docker-compose__${postfix}.yml"
+        docker compose -f ${idhub_dc_f} down -v || true
+        make idhub_build \
+                && docker compose -f ${idhub_dc_f} up ${detach:-}
+}
+
+main "${@}"

docker-compose__pilot-xo9b.yml

@@ -15,7 +15,7 @@ services:
       - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER}
       - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD}
       - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL}
-      - CSRF_TRUSTED_ORIGINS=${IDHUB_CSRF_TRUSTED_ORIGINS}
+      - CSRF_TRUSTED_ORIGINS=https://idhub1-xo9b.demo.pangea.org
       - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL}
       - EMAIL_HOST=${IDHUB_EMAIL_HOST}
       - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER}
@@ -23,13 +23,13 @@ services:
       - EMAIL_PORT=${IDHUB_EMAIL_PORT}
       - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS}
       - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND}
-      - RESPONSE_URI=https://idhub1.demo.pangea.org/oidc4vp/
+      - RESPONSE_URI=https://idhub1-xo9b.demo.pangea.org/oidc4vp/
-      - ALLOW_CODE_URI=https://idhub1.demo.pangea.org/oidc4vp/allow_code
+      - ALLOW_CODE_URI=https://idhub1-xo9b.demo.pangea.org/oidc4vp/allow_code
       - SUPPORTED_CREDENTIALS=['MembershipCard']
     ports:
       - 9001:9001
     volumes:
-      - ./idhub1:/opt/idhub
+      - ./idhub1__pilot-xo9b:/opt/idhub
       - sharedsecret:/sharedsecret:rw
 
   idhub2:
@@ -46,7 +46,7 @@ services:
       - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER}
       - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD}
       - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL}
-      - CSRF_TRUSTED_ORIGINS=${IDHUB_CSRF_TRUSTED_ORIGINS}
+      - CSRF_TRUSTED_ORIGINS=https://idhub2-xo9b.demo.pangea.org
       - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL}
       - EMAIL_HOST=${IDHUB_EMAIL_HOST}
       - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER}
@@ -54,13 +54,13 @@ services:
       - EMAIL_PORT=${IDHUB_EMAIL_PORT}
       - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS}
       - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND}
-      - RESPONSE_URI=https://idhub2.demo.pangea.org/oidc4vp/
+      - RESPONSE_URI=https://idhub2-xo9b.demo.pangea.org/oidc4vp/
-      - ALLOW_CODE_URI=https://idhub2.demo.pangea.org/oidc4vp/allow_code
+      - ALLOW_CODE_URI=https://idhub2-xo9b.demo.pangea.org/oidc4vp/allow_code
       - SUPPORTED_CREDENTIALS=['MembershipCard']
     ports:
       - 9002:9002
     volumes:
-      - ./idhub2:/opt/idhub
+      - ./idhub2__pilot-xo9b:/opt/idhub
       - sharedsecret:/sharedsecret:rw
 
 volumes:

idhub_build_demo_12d.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-set -e
-set -u
-# DEBUG
-set -x
-
-# wallet and verifier idhub demo
-main() {
-        deployment="${1:-}"
-
-        # detach on production deployment
-        if [ "${deployment}" = 'prod' ]; then
-                detach='-d'
-        fi
-
-        # force recreate
-        rm -rf ./idhub1 ./idhub2
-
-        # detect if is new
-        if [ ! -f "./idhub1" ] && [ ! -f "./idhub2" ]; then
-                echo 'Detected new deployment, recreating git repos idhub1 and idhub2'
-                cp -rp IdHub idhub1
-                rm -f idhub1/db.sqlite3
-                cp -rp IdHub idhub2
-                rm -f idhub2/db.sqlite3
-        fi
-
-        idhub_dc_f='docker-compose_idhub-demo-12d.yml'
-        docker compose -f ${idhub_dc_f} down -v || true
-        make idhub_build \
-                && docker compose -f ${idhub_dc_f} up ${detach:-}
-}
-
-main "${@}"