[taler-deployment] branch master updated: change Libeufin ports.

[gnunet]

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 62d787f  change Libeufin ports.
62d787f is described below

commit 62d787facf9ed88fc62deddc262486737266d6de
Author: MS <ms@taler.net>
AuthorDate: Wed Oct 12 14:41:11 2022 +0200

    change Libeufin ports.
---
 docker/hybrid/docker-compose.yml         |  4 ++--
 docker/hybrid/images/exchange/startup.sh |  2 +-
 docker/hybrid/images/libeufin/startup.sh | 24 ++++++++++++++----------
 docker/hybrid/test-docker-mvp.sh         |  2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/docker/hybrid/docker-compose.yml b/docker/hybrid/docker-compose.yml
index da297d0..3764172 100644
--- a/docker/hybrid/docker-compose.yml
+++ b/docker/hybrid/docker-compose.yml
@@ -29,5 +29,5 @@ services:
   bank:
     build: ./images/libeufin
     ports:
-      - 5000:5000 # Sandbox
-      - 5001:5001 # Nexus
+      - 15000:15000 # Sandbox
+      - 15001:15001 # Nexus
diff --git a/docker/hybrid/images/exchange/startup.sh 
b/docker/hybrid/images/exchange/startup.sh
index b5d9516..3515191 100644
--- a/docker/hybrid/images/exchange/startup.sh
+++ b/docker/hybrid/images/exchange/startup.sh
@@ -18,7 +18,7 @@ sed -i 
"s/__EXCHANGE_NEXUS_USERNAME__/${EXCHANGE_NEXUS_USERNAME}/" /config/taler
 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
+sed -i "s;__NEXUS_URL__;http://bank:15001;"; /config/taler.conf
 
 while ! pg_isready -h talerdb -d taler; do
   echo DB not ready yet.
diff --git a/docker/hybrid/images/libeufin/startup.sh 
b/docker/hybrid/images/libeufin/startup.sh
index 4c35cdb..609a09b 100644
--- a/docker/hybrid/images/libeufin/startup.sh
+++ b/docker/hybrid/images/libeufin/startup.sh
@@ -2,7 +2,12 @@
 
 set -eu
 
-## SANDBOX SETUP
+SANDBOX_PORT=15000
+NEXUS_PORT=15001
+SANDBOX_BASE_URL="http://localhost:${SANDBOX_PORT}";
+# As wanted by the Libeufin CLI:
+export LIBEUFIN_SANDBOX_URL="${SANDBOX_BASE_URL}/demobanks/default"
+export LIBEUFIN_NEXUS_URL="http://localhost:${NEXUS_PORT}";
 
 # invoke: username password iban name
 register_sandbox_account() {
@@ -15,12 +20,13 @@ register_sandbox_account() {
 
 # takes port and service name
 is_serving() {
+  echo Is $1 serving?
   for n in `seq 1 80`
     do
       echo "."
       sleep 0.1
       OK=1
-      wget http://localhost:$1 -o /dev/null -O /dev/null >/dev/null && break
+      wget $1 -o /dev/null -O /dev/null >/dev/null && break
       OK=0
     done
     if [ 1 != $OK ]
@@ -35,7 +41,6 @@ EXCHANGE_IBAN=DE159593
 
 export LIBEUFIN_SANDBOX_DB_CONNECTION="jdbc:sqlite:/libeufin.sqlite3"
 export LIBEUFIN_SANDBOX_ADMIN_PASSWORD=secret
-export LIBEUFIN_SANDBOX_URL="http://localhost:5000/demobanks/default";
 echo -n "Creating EUR default demobank..."
 libeufin-sandbox config --currency EUR default
 echo DONE
@@ -45,9 +50,9 @@ libeufin-sandbox default-exchange \
   "payto://iban/SANDBOXX/${EXCHANGE_IBAN}?receiver-name=Exchange+Company"
 echo DONE
 echo -n "Launching Sandbox..."
-libeufin-sandbox serve --no-localhost-only &
+libeufin-sandbox serve --no-localhost-only --port $SANDBOX_PORT &
 echo DONE
-is_serving 5000 Sandbox
+is_serving ${LIBEUFIN_SANDBOX_URL} Sandbox
 
 EXCHANGE_SANDBOX_USERNAME=exchange-at-sandbox
 EXCHANGE_SANDBOX_PASSWORD=x
@@ -59,7 +64,7 @@ export LIBEUFIN_SANDBOX_USERNAME=admin
 export LIBEUFIN_SANDBOX_PASSWORD=secret
 echo -n "Create EBICS host at Sandbox.."
 libeufin-cli sandbox \
-  --sandbox-url http://localhost:5000 \
+  --sandbox-url $SANDBOX_BASE_URL \
   ebicshost create --host-id talerebics
 echo DONE
 libeufin-cli sandbox \
@@ -75,16 +80,15 @@ echo -n "Creating Nexus superuser..."
 libeufin-nexus superuser $EXCHANGE_NEXUS_USERNAME --password 
$EXCHANGE_NEXUS_PASSWORD
 echo DONE
 echo -n "Launching Nexus..."
-libeufin-nexus serve --no-localhost-only &
+libeufin-nexus serve --no-localhost-only --port $NEXUS_PORT &
 echo DONE
-is_serving 5001 Nexus
+is_serving $LIBEUFIN_NEXUS_URL Nexus
 
 export LIBEUFIN_NEXUS_USERNAME=$EXCHANGE_NEXUS_USERNAME
 export LIBEUFIN_NEXUS_PASSWORD=$EXCHANGE_NEXUS_PASSWORD
-export LIBEUFIN_NEXUS_URL="http://localhost:5001";
 echo -n Creating a EBICS connection at Nexus..
 libeufin-cli connections new-ebics-connection \
-  --ebics-url "http://localhost:5000/ebicsweb"; \
+  --ebics-url "${SANDBOX_BASE_URL}/ebicsweb" \
   --host-id talerebics \
   --partner-id talerpartner \
   --ebics-user-id exchangeebics \
diff --git a/docker/hybrid/test-docker-mvp.sh b/docker/hybrid/test-docker-mvp.sh
index 74df183..feb94f4 100755
--- a/docker/hybrid/test-docker-mvp.sh
+++ b/docker/hybrid/test-docker-mvp.sh
@@ -3,7 +3,7 @@
 taler-wallet-cli --no-throttle api --expect-success 'runIntegrationTest' \
   '{"amountToSpend":"EUR:1",
     "amountToWithdraw":"EUR:3",
-    "bankBaseUrl":"http://localhost:5000/demobanks/default/access-api/";,
+    "bankBaseUrl":"http://localhost:15000/demobanks/default/access-api/";,
     "exchangeBaseUrl":"http://localhost:5555/";,
     "merchantBaseUrl":"http://localhost:5556/";
   }'

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.