sandcastle-ng

commit b221169e22c8110ad3979d8526c13b54a9793a9e
parent 127767c496fa0f7e8b27ab8c189f8c32b8dbdc9d
Author: Özgür Kesim <oec@codeblau.de>
Date:   Mon, 31 Mar 2025 23:07:22 +0200

[provision] provision service enabled

Diffstat:
M
buildconfig/merchant-demos.tag
 | 
2
+-
M
host/container-taler-sandcastle-demo.service
 | 
1
+
M
host/container-taler-sandcastle-head.service
 | 
1
+
M
host/container-taler-sandcastle-kyctest.service
 | 
1
+
M
host/container-taler-sandcastle-liebe.service
 | 
1
+
M
host/container-taler-sandcastle-test.service
 | 
1
+
M
sandcastle-run
 | 
3
+++
M
scripts/demo/setup-sandcastle.sh
 | 
26
++++++++++++++++++++++++--

8 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/buildconfig/merchant-demos.tag b/buildconfig/merchant-demos.tag
@@ -1 +1 @@
-v0.14.0-dev.7
+v0.14.0-dev.8
diff --git a/host/container-taler-sandcastle-demo.service b/host/container-taler-sandcastle-demo.service
@@ -14,6 +14,7 @@ Environment=SANDCASTLE_PORT_BLOG=127.0.0.1:5559
 Environment=SANDCASTLE_PORT_DONATIONS=127.0.0.1:5560
 Environment=SANDCASTLE_PORT_SURVEY=127.0.0.1:5561
 Environment=SANDCASTLE_PORT_LANDING=127.0.0.1:5562
+Environment=SANDCASTLE_PORT_PROVISION=127.0.0.1:5563
 Environment=SANDCASTLE_PORT_LIBEUFIN_BANK=127.0.0.1:15000
 Environment=SANDCASTLE_PORT_BANK_SPA=127.0.0.1:15002
 Environment=SANDCASTLE_PORT_CHALLENGER=127.0.0.1:15003
diff --git a/host/container-taler-sandcastle-head.service b/host/container-taler-sandcastle-head.service
@@ -14,6 +14,7 @@ Environment=SANDCASTLE_PORT_EXCHANGE=127.0.0.1:17001
 Environment=SANDCASTLE_PORT_BLOG=127.0.0.1:17002
 Environment=SANDCASTLE_PORT_DONATIONS=127.0.0.1:17003
 Environment=SANDCASTLE_PORT_LANDING=127.0.0.1:17005
+Environment=SANDCASTLE_PORT_PROVISION=127.0.0.1:17006
 Environment=SANDCASTLE_PORT_LIBEUFIN_BANK=127.0.0.1:17007
 Environment=SANDCASTLE_PORT_BANK_SPA=127.0.0.1:17009
 Environment=SANDCASTLE_PORT_CHALLENGER=127.0.0.1:17010
diff --git a/host/container-taler-sandcastle-kyctest.service b/host/container-taler-sandcastle-kyctest.service
@@ -14,6 +14,7 @@ Environment=SANDCASTLE_PORT_EXCHANGE=127.0.0.1:16401
 Environment=SANDCASTLE_PORT_BLOG=127.0.0.1:16402
 Environment=SANDCASTLE_PORT_DONATIONS=127.0.0.1:16403
 Environment=SANDCASTLE_PORT_LANDING=127.0.0.1:16405
+Environment=SANDCASTLE_PORT_PROVISION=127.0.0.1:16406
 Environment=SANDCASTLE_PORT_LIBEUFIN_BANK=127.0.0.1:16407
 Environment=SANDCASTLE_PORT_BANK_SPA=127.0.0.1:16409
 Environment=SANDCASTLE_PORT_CHALLENGER=127.0.0.1:16410
diff --git a/host/container-taler-sandcastle-liebe.service b/host/container-taler-sandcastle-liebe.service
@@ -13,6 +13,7 @@ Environment=SANDCASTLE_PORT_MERCHANT=127.0.0.1:26000
 Environment=SANDCASTLE_PORT_EXCHANGE=127.0.0.1:26001
 Environment=SANDCASTLE_PORT_BLOG=127.0.0.1:26002
 Environment=SANDCASTLE_PORT_DONATIONS=127.0.0.1:26003
+Environment=SANDCASTLE_PORT_PROVISION=127.0.0.1:26004
 Environment=SANDCASTLE_PORT_LANDING=127.0.0.1:26005
 Environment=SANDCASTLE_PORT_LIBEUFIN_BANK=127.0.0.1:26007
 Environment=SANDCASTLE_PORT_BANK_SPA=127.0.0.1:26009
diff --git a/host/container-taler-sandcastle-test.service b/host/container-taler-sandcastle-test.service
@@ -13,6 +13,7 @@ Environment=SANDCASTLE_PORT_MERCHANT=127.0.0.1:16000
 Environment=SANDCASTLE_PORT_EXCHANGE=127.0.0.1:16001
 Environment=SANDCASTLE_PORT_BLOG=127.0.0.1:16002
 Environment=SANDCASTLE_PORT_DONATIONS=127.0.0.1:16003
+Environment=SANDCASTLE_PORT_PROVISION=127.0.0.1:16004
 Environment=SANDCASTLE_PORT_LANDING=127.0.0.1:16005
 Environment=SANDCASTLE_PORT_LIBEUFIN_BANK=127.0.0.1:16007
 Environment=SANDCASTLE_PORT_BANK_SPA=127.0.0.1:16009
diff --git a/sandcastle-run b/sandcastle-run
@@ -9,6 +9,7 @@ SANDCASTLE_PORT_MERCHANT=${SANDCASTLE_PORT_MERCHANT:-127.0.0.1:16000}
 SANDCASTLE_PORT_EXCHANGE=${SANDCASTLE_PORT_EXCHANGE:-127.0.0.1:16001}
 SANDCASTLE_PORT_BLOG=${SANDCASTLE_PORT_BLOG:-127.0.0.1:16002}
 SANDCASTLE_PORT_DONATIONS=${SANDCASTLE_PORT_DONATIONS:-127.0.0.1:16003}
+SANDCASTLE_PORT_PROVISION=${SANDCASTLE_PORT_PROVISION:-127.0.0.1:16004}
 SANDCASTLE_PORT_LANDING=${SANDCASTLE_PORT_LANDING:-127.0.0.1:16005}
 SANDCASTLE_PORT_LIBEUFIN_BANK=${SANDCASTLE_PORT_LIBEUFIN_BANK:-127.0.0.1:16007}
 SANDCASTLE_PORT_BANK_SPA=${SANDCASTLE_PORT_BANK_SPA:-127.0.0.1:16009}
@@ -22,6 +23,7 @@ PORT_INTERNAL_LIBEUFIN_BANK=8080
 PORT_INTERNAL_LANDING=8501
 PORT_INTERNAL_BLOG=8502
 PORT_INTERNAL_DONATIONS=8503
+PORT_INTERNAL_PROVISION=8504
 PORT_INTERNAL_BANK_SPA=8505
 PORT_INTERNAL_CHALLENGER=8506
 PORT_INTERNAL_AUDITOR=8507
@@ -73,6 +75,7 @@ exec podman run \
   -p=$SANDCASTLE_PORT_LANDING:$PORT_INTERNAL_LANDING \
   -p=$SANDCASTLE_PORT_BLOG:$PORT_INTERNAL_BLOG \
   -p=$SANDCASTLE_PORT_DONATIONS:$PORT_INTERNAL_DONATIONS \
+  -p=$SANDCASTLE_PORT_PROVISION:$PORT_INTERNAL_PROVISION \
   -p=$SANDCASTLE_PORT_BANK_SPA:$PORT_INTERNAL_BANK_SPA \
   -p=$SANDCASTLE_PORT_CHALLENGER:$PORT_INTERNAL_CHALLENGER \
   -p=$SANDCASTLE_PORT_AUDITOR:$PORT_INTERNAL_AUDITOR \
diff --git a/scripts/demo/setup-sandcastle.sh b/scripts/demo/setup-sandcastle.sh
@@ -67,6 +67,7 @@ PORT_INTERNAL_LIBEUFIN_BANK=8080
 PORT_INTERNAL_LANDING=8501
 PORT_INTERNAL_BLOG=8502
 PORT_INTERNAL_DONATIONS=8503
+PORT_INTERNAL_PROVISION=8504
 PORT_INTERNAL_BANK_SPA=8505
 PORT_INTERNAL_CHALLENGER=8506
 PORT_INTERNAL_AUDITOR=8507
@@ -83,6 +84,7 @@ systemctl stop taler-merchant.target
 systemctl stop taler-demo-landing.service
 systemctl stop taler-demo-blog.service
 systemctl stop taler-demo-donations.service
+systemctl stop taler-demo-provision.service
 systemctl stop libeufin-bank.service
 
 # libeufin-nexus is not used
@@ -209,7 +211,8 @@ cat <<EOF >/etc/libeufin/settings.json
     "Landing": "$PROTO://$LANDING_DOMAIN$PORT_SUFFIX/",
     "Bank": "$PROTO://$BANK_DOMAIN$PORT_SUFFIX",
     "Essay Shop": "$PROTO://$BLOG_DOMAIN$PORT_SUFFIX",
-    "Donations": "$PROTO://$DONATIONS_DOMAIN$PORT_SUFFIX"
+    "Donations": "$PROTO://$DONATIONS_DOMAIN$PORT_SUFFIX",
+    "Self-Provision": "$PROTO://$LANDING_DOMAIN$PORT_SUFFIX/provision"
   }
 }
 EOF
@@ -347,6 +350,16 @@ BACKEND_URL_TALER = $PROTO://$MERCHANT_DOMAIN$PORT_SUFFIX/instances/taler/
 BACKEND_APIKEY_TALER = secret-token:$(get_credential_pw merchant/taler)
 BACKEND_URL_GNUNET = $PROTO://$MERCHANT_DOMAIN$PORT_SUFFIX/instances/gnunet/
 BACKEND_APIKEY_GNUNET = secret-token:$(get_credential_pw merchant/gnunet)
+
+[frontend-demo-provision]
+SERVE = http
+HTTP_PORT = $PORT_INTERNAL_PROVISION
+BACKEND_URL_MERCHANT = $PROTO://$MERCHANT_DOMAIN$PORT_SUFFIX
+BACKEND_APIKEY_MERCHANT = secret-token:$(get_credential_pw merchant/default)
+BACKEND_URL_BANK = $PROTO://$BANK_DOMAIN$PORT_SUFFIX
+BACKEND_APIKEY_BANK = secret-token:$(get_credential_pw bank/admin)
+TIMEOUT_INIT = 1hour
+TIMEOUT_IDLE = 7days
 EOF
 
 # This really should not exist, the taler-merchant-frontends
@@ -357,6 +370,7 @@ 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/
 EOF
 
 #
@@ -534,6 +548,7 @@ https://$CHALLENGER_DOMAIN {
   tls internal
   reverse_proxy unix//run/challenger/httpd/challenger.http
 }
+
 EOF
 
 else
@@ -566,7 +581,12 @@ http://$CHALLENGER_DOMAIN$PORT_SUFFIX {
 }
 
 http://$LANDING_DOMAIN$PORT_SUFFIX {
-  reverse_proxy :$PORT_INTERNAL_LANDING
+  handle /provision/* {
+     reverse_proxy :$PORT_INTERNAL_PROVISION
+  }
+  handle {
+     reverse_proxy :$PORT_INTERNAL_LANDING
+  }
 }
 
 http://$BLOG_DOMAIN$PORT_SUFFIX {
@@ -576,6 +596,7 @@ http://$BLOG_DOMAIN$PORT_SUFFIX {
 http://$DONATIONS_DOMAIN$PORT_SUFFIX {
   reverse_proxy :$PORT_INTERNAL_DONATIONS
 }
+
 EOF
 
 fi
@@ -934,6 +955,7 @@ taler-harness deployment provision-merchant-instance \
 systemctl enable --now taler-demo-landing
 systemctl enable --now taler-demo-blog
 systemctl enable --now taler-demo-donations
+systemctl enable --now taler-demo-provision
 
 # FIXME: Maybe do some taler-wallet-cli test?
 # FIXME: How do we report errors occurring during the setup script?