[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-deployment] branch master updated: wget invocation
From: |
gnunet |
Subject: |
[taler-deployment] branch master updated: wget invocation |
Date: |
Tue, 01 Nov 2022 20:17:54 +0100 |
This is an automated email from the git hooks/post-receive script.
ms pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new 0cfe36c wget invocation
0cfe36c is described below
commit 0cfe36ce3229f50d7303acf8bde5d517d5b2a387
Author: MS <ms@taler.net>
AuthorDate: Tue Nov 1 20:17:46 2022 +0100
wget invocation
---
docker/hybrid/images/merchant/startup.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/docker/hybrid/images/merchant/startup.sh
b/docker/hybrid/images/merchant/startup.sh
index 46cc216..9d74d50 100644
--- a/docker/hybrid/images/merchant/startup.sh
+++ b/docker/hybrid/images/merchant/startup.sh
@@ -42,20 +42,21 @@ 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.
is_serving () {
set +u # tolerate missing $2
echo Checking $1
-HEADER_OPT=""
-# --header only used for auth
-if test -n "$2"; then
- HEADER_OPT='--header "'$2'"'
-fi
for n in `seq 1 50`
do
echo "."
sleep 0.5
OK=1
- wget $HEADER_OPT $1 -o /dev/null -O /dev/null >/dev/null && break
+ # auth case.
+ 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
OK=0
done
if [ 1 != $OK ]
@@ -123,9 +124,8 @@ 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.
-AUTH=$(echo "$SURVEY_USERNAME:$SURVEY_PASSWORD" | base64)
is_serving "${SANDBOX_URL}/access-api/accounts/${SURVEY_USERNAME}" \
- "Authorization: Basic $AUTH"
+ "Authorization: Basic $(echo $SURVEY_USERNAME:$SURVEY_PASSWORD | base64)"
export LIBEUFIN_SANDBOX_USERNAME=${SURVEY_USERNAME}
export LIBEUFIN_SANDBOX_PASSWORD=${SURVEY_PASSWORD}
libeufin-cli sandbox \
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-deployment] branch master updated: wget invocation,
gnunet <=