taler-deployment

commit f0cba5bead3e0767f3ec51a7947ac6a1e9e2aa25
parent 3627925b9bd6f078c5cf32da1d100283863e1ec6
Author: MS <ms@taler.net>
Date:   Wed,  2 Nov 2022 08:53:36 +0100

revert previous and fix wget auth

Diffstat:
M
docker/hybrid/images/merchant/startup.sh
 | 
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/docker/hybrid/images/merchant/startup.sh b/docker/hybrid/images/merchant/startup.sh
@@ -42,7 +42,7 @@ socat TCP-LISTEN:5555,fork,reuseaddr TCP:exchange:80 &
 # to make frontends reach the backend.
 socat TCP-LISTEN:5556,fork,reuseaddr TCP:localhost:80 &
 
-# $2/$3 might have credentials
+# $2 might have Authorization header.
 is_serving () {
 set +u # tolerate missing $2
 echo Checking $1
@@ -52,8 +52,8 @@ for n in `seq 1 50`
     sleep 0.5
     OK=1
     # auth case.
-    if test -n "$2" -a -n "$3"; then
-      wget --user "$2" --password "$3" $1 -o /dev/null -O /dev/null >/dev/null && break
+    if test -n "$2"; then
+      wget --header "$2" $1 -o /dev/null -O /dev/null >/dev/null && break
     else
       wget $1 -o /dev/null -O /dev/null >/dev/null && break
     fi
@@ -124,7 +124,9 @@ is_serving "${SANDBOX_URL}/integration-api/config"
 SURVEY_USERNAME=`taler-config -c /config/deployment.conf -s taler-deployment -o survey-sandbox-username`
 SURVEY_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o survey-sandbox-password`
 # Check/wait that the Survey site got its bank account.
-is_serving "${SANDBOX_URL}/access-api/accounts/${SURVEY_USERNAME}" $SURVEY_USERNAME $SURVEY_PASSWORD
+curl "${SANDBOX_URL}/access-api/public-accounts"
+is_serving "${SANDBOX_URL}/access-api/accounts/${SURVEY_USERNAME}" \
+  "Authorization: Basic $(echo -n $SURVEY_USERNAME:$SURVEY_PASSWORD | base64)"
 export LIBEUFIN_SANDBOX_USERNAME=${SURVEY_USERNAME}
 export LIBEUFIN_SANDBOX_PASSWORD=${SURVEY_PASSWORD}
 libeufin-cli sandbox \