diff options
| author | MS <ms@taler.net> | 2022-11-01 20:42:00 +0100 |
|---|---|---|
| committer | MS <ms@taler.net> | 2022-11-01 20:42:00 +0100 |
| commit | 33e0f1791d1b5047e9c07222be6486441aca9def (patch) | |
| tree | 6180a82221eee1eef0bcd9f499fd29ee6fec9c95 /docker/hybrid/images/merchant/startup.sh | |
| parent | 0cfe36ce3229f50d7303acf8bde5d517d5b2a387 (diff) | |
| download | deployment-33e0f1791d1b5047e9c07222be6486441aca9def.tar.gz deployment-33e0f1791d1b5047e9c07222be6486441aca9def.tar.bz2 deployment-33e0f1791d1b5047e9c07222be6486441aca9def.zip | |
use appropriate credentials options
Diffstat (limited to 'docker/hybrid/images/merchant/startup.sh')
| -rw-r--r-- | docker/hybrid/images/merchant/startup.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docker/hybrid/images/merchant/startup.sh b/docker/hybrid/images/merchant/startup.sh index 9d74d50..8732891 100644 --- 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 might have Authorization header. +# $2/$3 might have credentials is_serving () { set +u # tolerate missing $2 echo Checking $1 @@ -52,7 +52,7 @@ for n in `seq 1 50` sleep 0.5 OK=1 # auth case. - if test -n "$2"; then + if test -n "$2" -a -n "$3"; 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 @@ -124,8 +124,7 @@ 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}" \ - "Authorization: Basic $(echo $SURVEY_USERNAME:$SURVEY_PASSWORD | base64)" +is_serving "${SANDBOX_URL}/access-api/accounts/${SURVEY_USERNAME}" $SURVEY_USERNAME $SURVEY_PASSWORD export LIBEUFIN_SANDBOX_USERNAME=${SURVEY_USERNAME} export LIBEUFIN_SANDBOX_PASSWORD=${SURVEY_PASSWORD} libeufin-cli sandbox \ |