sandcastle-ng

commit 8dfa53597a780d73b35b8f81c35c4c1af1be3613
parent 8a564dfd662e7f93bfa238d5e625b6b810760ed0
Author: Florian Dold <florian@dold.me>
Date:   Wed,  9 Apr 2025 14:12:24 +0200

admin, not default

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

2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/buildconfig/libeufin.tag b/buildconfig/libeufin.tag
@@ -1 +1 @@
-v0.14.9-dev.2
+v0.14.9-dev.1
diff --git a/scripts/demo/setup-sandcastle.sh b/scripts/demo/setup-sandcastle.sh
@@ -41,7 +41,7 @@ EXCHANGE_PLAIN_PAYTO=payto://iban/$EXCHANGE_IBAN
 EXCHANGE_FULL_PAYTO="payto://iban/$EXCHANGE_IBAN?receiver-name=Sandcastle+Echange+Inc"
 
 # Randomly generated IBANs for the merchants
-MERCHANT_IBAN_DEFAULT=DE5135717
+MERCHANT_IBAN_ADMIN=DE5135717
 MERCHANT_IBAN_POS=DE4218710
 MERCHANT_IBAN_BLOG=DE8292195
 MERCHANT_IBAN_GNUNET=DE9709960
@@ -355,7 +355,7 @@ BACKEND_APIKEY_GNUNET = secret-token:$(get_credential_pw merchant/gnunet)
 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_APIKEY_MERCHANT = secret-token:$(get_credential_pw merchant/admin)
 BACKEND_URL_BANK = $PROTO://$BANK_DOMAIN$PORT_SUFFIX
 BACKEND_APIKEY_BANK = secret-token:$(get_credential_pw bank/admin)
 TIMEOUT_INIT = 1hour
@@ -644,12 +644,12 @@ taler-harness deployment provision-bank-account "${BANK_BASEURL}" \
   --name Exchange \
   --password $(get_credential_pw bank/exchange)
 
-sudo -i -u libeufin-bank libeufin-bank passwd merchant-default $(get_credential_pw bank/merchant-default) || true
+sudo -i -u libeufin-bank libeufin-bank passwd merchant-admin $(get_credential_pw bank/merchant-admin) || true
 taler-harness deployment provision-bank-account "${BANK_BASEURL}" \
-  --login merchant-default --public \
-  --payto "payto://iban/$MERCHANT_IBAN_DEFAULT" \
+  --login merchant-admin --public \
+  --payto "payto://iban/$MERCHANT_IBAN_ADMIN" \
   --name "Default Demo Merchant" \
-  --password $(get_credential_pw bank/merchant-default)
+  --password $(get_credential_pw bank/merchant-admin)
 
 sudo -i -u libeufin-bank libeufin-bank passwd merchant-pos $(get_credential_pw bank/merchant-pos) || true
 taler-harness deployment provision-bank-account "${BANK_BASEURL}" \
@@ -769,19 +769,19 @@ function reset_merchant_pw() {
   sudo -u taler-merchant-httpd taler-merchant-passwd --instance "$1" "$pw" || true
 }
 
-reset_merchant_pw default
+reset_merchant_pw admin
 taler-harness deployment provision-merchant-instance \
   ${MERCHANT_BASEURL} \
-  --management-token secret-token:$(get_credential_pw merchant/default) \
-  --instance-token secret-token:$(get_credential_pw merchant/default) \
+  --management-token secret-token:$(get_credential_pw merchant/admin) \
+  --instance-token secret-token:$(get_credential_pw merchant/admin) \
   --name Merchant \
-  --id default \
-  --payto "payto://iban/$MERCHANT_IBAN_DEFAULT?receiver-name=Merchant"
+  --id admin \
+  --payto "payto://iban/$MERCHANT_IBAN_ADMIN?receiver-name=Merchant"
 
 reset_merchant_pw pos
 taler-harness deployment provision-merchant-instance \
   ${MERCHANT_BASEURL} \
-  --management-token secret-token:$(get_credential_pw merchant/default) \
+  --management-token secret-token:$(get_credential_pw merchant/admin) \
   --instance-token secret-token:$(get_credential_pw merchant/pos) \
   --name "POS Merchant" \
   --id pos \
@@ -790,7 +790,7 @@ 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/default) \
+  --management-token secret-token:$(get_credential_pw merchant/admin) \
   --instance-token secret-token:$(get_credential_pw merchant/blog) \
   --name "Blog Merchant" \
   --id blog \
@@ -799,7 +799,7 @@ 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/default) \
+  --management-token secret-token:$(get_credential_pw merchant/admin) \
   --instance-token secret-token:$(get_credential_pw merchant/gnunet) \
   --name "GNUnet Merchant" \
   --id gnunet \
@@ -808,7 +808,7 @@ 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/default) \
+  --management-token secret-token:$(get_credential_pw merchant/admin) \
   --instance-token secret-token:$(get_credential_pw merchant/taler) \
   --name "Taler Merchant" \
   --id taler \
@@ -817,7 +817,7 @@ 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/default) \
+  --management-token secret-token:$(get_credential_pw merchant/admin) \
   --instance-token secret-token:$(get_credential_pw merchant/tor) \
   --name "Tor Merchant" \
   --id tor \
@@ -827,7 +827,7 @@ 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/default) \
+  --management-token secret-token:$(get_credential_pw merchant/admin) \
   --instance-token secret-token:sandbox \
   --name "sandbox merchant" \
   --id sandbox \