sandcastle-ng

commit 593b4b9e68a67a8bf81ae3f422ecd7cbc59983af
parent 1b546080f399536c9fee5b9dbf19ff3907d3ddfd
Author: Özgür Kesim <oec@codeblau.de>
Date:   Sun, 20 Apr 2025 17:52:25 +0200

[provision] provision path set per env $PROVSION_PREFIX

Diffstat:
M
buildconfig/merchant-demos.tag
 | 
2
+-
M
scripts/demo/setup-sandcastle.sh
 | 
13
+++++++++----

2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/buildconfig/merchant-demos.tag b/buildconfig/merchant-demos.tag
@@ -1 +1 @@
-v0.14.0-dev.14
+v0.14.0-dev.17
diff --git a/scripts/demo/setup-sandcastle.sh b/scripts/demo/setup-sandcastle.sh
@@ -59,6 +59,9 @@ DONATIONS_DOMAIN=donations.$MYDOMAIN
 CHALLENGER_DOMAIN=challenger.$MYDOMAIN
 AUDITOR_DOMAIN=auditor.$MYDOMAIN
 
+# Prefix for URL to the provisioning service, without "/"
+PROVISION_PREFIX=provision
+
 # Ports of the services running inside the container.
 # Should be synchronized with the sandcastle-run script.
 PORT_INTERNAL_EXCHANGE=8201
@@ -72,6 +75,7 @@ PORT_INTERNAL_BANK_SPA=8505
 PORT_INTERNAL_CHALLENGER=8506
 PORT_INTERNAL_AUDITOR=8507
 
+
 ENABLE_AUDITOR=0
 
 # Just make sure the services are stopped
@@ -213,7 +217,7 @@ cat <<EOF >/etc/libeufin/settings.json
     "Bank": "$PROTO://$BANK_DOMAIN$PORT_SUFFIX",
     "Essay Shop": "$PROTO://$BLOG_DOMAIN$PORT_SUFFIX",
     "Donations": "$PROTO://$DONATIONS_DOMAIN$PORT_SUFFIX",
-    "Self-Provision": "$PROTO://$LANDING_DOMAIN$PORT_SUFFIX/provision"
+    "Self-Provision": "$PROTO://$LANDING_DOMAIN$PORT_SUFFIX/$PROVISION_PREFIX"
   }
 }
 EOF
@@ -371,7 +375,8 @@ TALER_ENV_URL_LANDING=$PROTO://$LANDING_DOMAIN$PORT_SUFFIX/
 TALER_ENV_URL_BANK=$PROTO://$BANK_DOMAIN$PORT_SUFFIX/
 TALER_ENV_URL_MERCHANT_BLOG=$PROTO://$BLOG_DOMAIN$PORT_SUFFIX/
 TALER_ENV_URL_MERCHANT_DONATIONS=$PROTO://$DONATIONS_DOMAIN$PORT_SUFFIX/
-TALER_ENV_URL_MERCHANT_PROVISION=$PROTO://$LANDING_DOMAIN$PORT_SUFFIX/provision/
+TALER_ENV_URL_MERCHANT_PROVISION_PREFIX=$PROVISION_PREFIX
+TALER_ENV_URL_MERCHANT_PROVISION=$PROTO://$LANDING_DOMAIN$PORT_SUFFIX/$PROVISION_PREFIX/
 EOF
 
 #
@@ -582,9 +587,9 @@ http://$CHALLENGER_DOMAIN$PORT_SUFFIX {
 }
 
 http://$LANDING_DOMAIN$PORT_SUFFIX {
-  handle_path /provision/* {
+  handle /$PROVISION_PREFIX/* {
      reverse_proxy :$PORT_INTERNAL_PROVISION {
-        header_up X-Forwarded-Prefix "/provision"
+        header_up X-Forwarded-Prefix "/$PROVISION_PREFIX"
      }
   }
   handle {