sandcastle-ng

commit 2965e249c67b1648a73457dd2ac3780db5fce78e
parent 07b7bf16a707b54de51a0bc6886af4440d8cc9bf
Author: Florian Dold <florian@dold.me>
Date:   Fri, 25 Jul 2025 17:25:42 +0200

user newer wallet/harness, separate password vs. token in merchant

Diffstat:
M
buildconfig/wallet.tag
 | 
2
+-
M
scripts/demo/setup-sandcastle.sh
 | 
31
++++++++++++++++---------------

2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/buildconfig/wallet.tag b/buildconfig/wallet.tag
@@ -1 +1 @@
-v1.0.19
+v1.0.25
diff --git a/scripts/demo/setup-sandcastle.sh b/scripts/demo/setup-sandcastle.sh
@@ -823,15 +823,16 @@ systemctl enable --now taler-merchant.target
 taler-harness deployment wait-taler-service taler-merchant ${MERCHANT_BASEURL}config
 
 function reset_merchant_pw() {
-  pw=secret-token:$(get_credential_pw merchant/$1)
+  pw=$(get_credential_pw merchant/$1)
   sudo -u taler-merchant-httpd taler-merchant-passwd --instance "$1" "$pw" || true
 }
 
 reset_merchant_pw admin
+ADMIN_TOK=$(taler-harness merchant token ${MERCHANT_BASEURL} admin --password $(get_credential_pw merchant/admin))
 taler-harness deployment provision-merchant-instance \
   ${MERCHANT_BASEURL} \
-  --management-token secret-token:$(get_credential_pw merchant/admin) \
-  --instance-token secret-token:$(get_credential_pw merchant/admin) \
+  --management-token $ADMIN_TOK \
+  --instance-password $(get_credential_pw merchant/admin) \
   --name Merchant \
   --id admin \
   --payto "$MERCHANT_PAYTO_ADMIN"
@@ -839,8 +840,8 @@ taler-harness deployment provision-merchant-instance \
 reset_merchant_pw pos
 taler-harness deployment provision-merchant-instance \
   ${MERCHANT_BASEURL} \
-  --management-token secret-token:$(get_credential_pw merchant/admin) \
-  --instance-token secret-token:$(get_credential_pw merchant/pos) \
+  --management-token $ADMIN_TOK \
+  --instance-password $(get_credential_pw merchant/pos) \
   --name "POS Merchant" \
   --id pos \
   --payto "$MERCHANT_PAYTO_POS"
@@ -848,8 +849,8 @@ taler-harness deployment provision-merchant-instance \
 reset_merchant_pw blog
 taler-harness deployment provision-merchant-instance \
   ${MERCHANT_BASEURL} \
-  --management-token secret-token:$(get_credential_pw merchant/admin) \
-  --instance-token secret-token:$(get_credential_pw merchant/blog) \
+  --management-token $ADMIN_TOK \
+  --instance-password $(get_credential_pw merchant/blog) \
   --name "Blog Merchant" \
   --id blog \
   --payto "$MERCHANT_PAYTO_BLOG"
@@ -857,8 +858,8 @@ taler-harness deployment provision-merchant-instance \
 reset_merchant_pw gnunet
 taler-harness deployment provision-merchant-instance \
   ${MERCHANT_BASEURL} \
-  --management-token secret-token:$(get_credential_pw merchant/admin) \
-  --instance-token secret-token:$(get_credential_pw merchant/gnunet) \
+  --management-token $ADMIN_TOK \
+  --instance-password $(get_credential_pw merchant/gnunet) \
   --name "GNUnet Merchant" \
   --id gnunet \
   --payto "$MERCHANT_PAYTO_GNUNET"
@@ -866,8 +867,8 @@ taler-harness deployment provision-merchant-instance \
 reset_merchant_pw taler
 taler-harness deployment provision-merchant-instance \
   ${MERCHANT_BASEURL} \
-  --management-token secret-token:$(get_credential_pw merchant/admin) \
-  --instance-token secret-token:$(get_credential_pw merchant/taler) \
+  --management-token $ADMIN_TOK \
+  --instance-password $(get_credential_pw merchant/taler) \
   --name "Taler Merchant" \
   --id taler \
   --payto "$MERCHANT_PAYTO_TALER"
@@ -875,8 +876,8 @@ taler-harness deployment provision-merchant-instance \
 reset_merchant_pw tor
 taler-harness deployment provision-merchant-instance \
   ${MERCHANT_BASEURL} \
-  --management-token secret-token:$(get_credential_pw merchant/admin) \
-  --instance-token secret-token:$(get_credential_pw merchant/tor) \
+  --management-token $ADMIN_TOK \
+  --instance-password $(get_credential_pw merchant/tor) \
   --name "Tor Merchant" \
   --id tor \
   --payto "$MERCHANT_PAYTO_TOR"
@@ -885,8 +886,8 @@ taler-harness deployment provision-merchant-instance \
 sudo -u taler-merchant-httpd taler-merchant-passwd --instance sandbox secret-token:sandbox || true
 taler-harness deployment provision-merchant-instance \
   ${MERCHANT_BASEURL} \
-  --management-token secret-token:$(get_credential_pw merchant/admin) \
-  --instance-token secret-token:sandbox \
+  --management-token $ADMIN_TOK \
+  --instance-password sandbox \
   --name "sandbox merchant" \
   --id sandbox \
   --payto "$MERCHANT_PAYTO_SANDBOX"