sandcastle-ng

commit dffa079814bdeeef6838c161c325946b68796393
parent fabed8811ccd8bea9aa776b8a53b12ead67de3a0
Author: Florian Dold <dold@taler.net>
Date:   Tue, 25 Aug 2026 18:03:22 +0200

demo setup: configure merchant demo public URLs

Diffstat:
M
scripts/demo/setup-sandcastle.sh
 | 
23
+++++++++--------------

1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/scripts/demo/setup-sandcastle.sh b/scripts/demo/setup-sandcastle.sh
@@ -525,19 +525,24 @@ EOF
 # Allow overrides to modify merchant config
 [[ $(type -t hook_merchant_config) == function ]] && hook_merchant_config
 
-# FIXME: This is a workaround, fix the packaging of taler-merchant-frontends here!
 mkdir -p /etc/taler-merchant-demos
 
 cat <<EOF >/etc/taler-merchant-demos/taler-merchant-demos.conf
 [taler]
 CURRENCY = $CURRENCY
 
+[frontend-demo]
+LANDING_URL = $PROTO://$LANDING_DOMAIN$PORT_SUFFIX/
+BANK_URL = $PROTO://$BANK_DOMAIN$PORT_SUFFIX/
+BLOG_URL = $PROTO://$BLOG_DOMAIN$PORT_SUFFIX/
+DONATIONS_URL = $PROTO://$DONATIONS_DOMAIN$PORT_SUFFIX/
+
 [frontend-demo-landing]
-SERVE = http
+HTTP_SERVE = tcp
 HTTP_PORT = $PORT_INTERNAL_LANDING_SERVICE
 
 [frontend-demo-blog]
-SERVE = http
+HTTP_SERVE = tcp
 HTTP_PORT = $PORT_INTERNAL_BLOG
 BACKEND_URL = $PROTO://$MERCHANT_DOMAIN$PORT_SUFFIX/instances/blog/
 BACKEND_APIKEY = secret-token:$(get_credential_pw merchant/blog)
@@ -545,7 +550,7 @@ ENABLE_TOKENS = ${ENABLE_SUBSCRIPTIONS:-no}
 
 [frontend-demo-donations]
 DONAU_URL = $PROTO://$DONAU_DOMAIN$PORT_SUFFIX/
-SERVE = http
+HTTP_SERVE = tcp
 HTTP_PORT = $PORT_INTERNAL_DONATIONS
 BACKEND_URL_TOR = $PROTO://$MERCHANT_DOMAIN$PORT_SUFFIX/instances/tor/
 BACKEND_APIKEY_TOR = secret-token:$(get_credential_pw merchant/tor)
@@ -555,16 +560,6 @@ BACKEND_URL_GNUNET = $PROTO://$MERCHANT_DOMAIN$PORT_SUFFIX/instances/gnunet/
 BACKEND_APIKEY_GNUNET = secret-token:$(get_credential_pw merchant/gnunet)
 EOF
 
-# This really should not exist, the taler-merchant-frontends
-# should be easier to configure!
-cat <<EOF >/etc/taler/taler-merchant-frontends.env
-TALER_ENV_URL_INTRO=$PROTO://$LANDING_DOMAIN$PORT_SUFFIX/
-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/
-EOF
-
 #
 # Create databases
 #