docker: launch wirewatch

4 files changed, 12 insertions, 9 deletions

diff --git a/docker/hybrid/images/exchange/startup.sh b/docker/hybrid/images/exchange/startup.sh
index 535bc91..f770985 100644
--- a/docker/hybrid/images/exchange/startup.sh
+++ b/docker/hybrid/images/exchange/startup.sh
@@ -4,17 +4,18 @@ set -eu
 export LD_LIBRARY_PATH=/usr/local/lib
 
 # to be 'sed' in the config:
-EXCHANGE_NEXUS_USERNAME=exchange
+EXCHANGE_NEXUS_USERNAME=exchange-at-nexus
 EXCHANGE_NEXUS_PASSWORD=x
 EXCHANGE_IBAN=DE159593
-TALER_FACADE_NAME=exchange-facade
+TALER_FACADE_NAME=taler-facade
 
-sed -i 's/__EXCHANGE_URL__/http:\/\/exchange:80\//' /config/taler.conf
+sed -i 's/__EXCHANGE_URL__/http:\/\/exchange\//' /config/taler.conf
 sed -i 's/__CURRENCY__/EUR/' /config/taler.conf
 sed -i "s/__EXCHANGE_NEXUS_USERNAME__/${EXCHANGE_NEXUS_USERNAME}/" /config/taler.conf
 sed -i "s/__EXCHANGE_NEXUS_PASSWORD__/${EXCHANGE_NEXUS_PASSWORD}/" /config/taler.conf
 sed -i "s/__EXCHANGE_IBAN__/${EXCHANGE_IBAN}/" /config/taler.conf
 sed -i "s/__TALER_FACADE_NAME__/${TALER_FACADE_NAME}/" /config/taler.conf
+sed -i "s/__NEXUS_URL__/http:\/\/bank:5001/" /config/taler.conf
 
 while ! pg_isready -h talerdb -d taler; do
   echo DB not ready yet.
@@ -25,7 +26,7 @@ echo Now DB is ready.
 # Make sure we have the right to connect
 echo "" | psql -h talerdb -d taler
 
-taler-exchange-dbinit -c /config/taler.conf --reset # &> /dev/null
+taler-exchange-dbinit -c /config/taler.conf --reset
 
 taler-exchange-secmod-eddsa -c /config/taler.conf &
 taler-exchange-secmod-rsa -c /config/taler.conf &
@@ -47,6 +48,7 @@ for n in `seq 1 80`
       echo "Failed to launch Exchange"
   fi
 echo Echange launched.
+taler-exchange-wirewatch -L DEBUG -c /config/taler.conf &
 
 taler-exchange-offline -c /config/taler.conf download sign upload
 wait
diff --git a/docker/hybrid/images/exchange/taler.conf b/docker/hybrid/images/exchange/taler.conf
index 5ca50c4..43a01d6 100644
--- a/docker/hybrid/images/exchange/taler.conf
+++ b/docker/hybrid/images/exchange/taler.conf
@@ -18,7 +18,7 @@ unixpath = /sockets/exchange-secmod-cs.sock
 [exchange-accountcredentials-1]
 username = __EXCHANGE_NEXUS_USERNAME__
 wire_gateway_auth_method = basic
-wire_gateway_url = ${NEXUS_URL}/facades/__TALER_FACADE_NAME__/taler-wire-gateway/
+wire_gateway_url = __NEXUS_URL__/facades/__TALER_FACADE_NAME__/taler-wire-gateway/
 password = __EXCHANGE_NEXUS_PASSWORD__
 
 [exchange-account-1]
diff --git a/docker/hybrid/images/libeufin/startup.sh b/docker/hybrid/images/libeufin/startup.sh
index fc6f70b..5389c31 100644
--- a/docker/hybrid/images/libeufin/startup.sh
+++ b/docker/hybrid/images/libeufin/startup.sh
@@ -116,9 +116,10 @@ libeufin-cli accounts task-schedule \
   $NEXUS_IMPORTED_BANKACCOUNT
 echo DONE
 echo -n Create the Taler facade at Nexus..
+FACADE_NAME=taler-facade
 libeufin-cli facades \
   new-taler-wire-gateway-facade \
-  --currency EUR --facade-name test-facade \
+  --currency EUR --facade-name $FACADE_NAME \
   talerconn $NEXUS_IMPORTED_BANKACCOUNT
 echo DONE
 
diff --git a/docker/hybrid/images/merchant/startup.sh b/docker/hybrid/images/merchant/startup.sh
index 4303e78..eeb9bde 100644
--- a/docker/hybrid/images/merchant/startup.sh
+++ b/docker/hybrid/images/merchant/startup.sh
@@ -9,10 +9,10 @@ while ! pg_isready -h talerdb -d taler; do
 done
 echo Now DB is ready.
 
-for n in `seq 1 80`
+for n in `seq 1 30`
   do
     echo "."
-    sleep 0.1
+    sleep 0.4
     OK=1
     wget http://exchange/ -o /dev/null -O /dev/null >/dev/null && break
     OK=0
@@ -20,6 +20,7 @@ for n in `seq 1 80`
   if [ 1 != $OK ]
   then
       echo "Exchange unreachable."
+      exit 1
   fi
 echo Echange reachable.
 
@@ -28,7 +29,6 @@ echo Found Exchange Pub: $EXCHANGE_MASTER_PUB
 sed -i 's/\${EXCHANGE_URL}/http:\/\/exchange\//' /config/taler.conf
 sed -i "s/\${EXCHANGE_PUB}/${EXCHANGE_MASTER_PUB}/" /config/taler.conf
 sed -i 's/\${CURRENCY}/EUR/' /config/taler.conf
-# FRONTENDS_APIKEY=secret-token:secret, later..
 
 taler-merchant-dbinit -c /config/taler.conf --reset
 taler-merchant-httpd -c /config/taler.conf &