taler-deployment

commit 9ecd95a941a240e62efbe0582f03b040bc161645
parent 63045bc9bb7d599bf9ae68d943cad667fdf17c0f
Author: MS <ms@taler.net>
Date:   Tue, 18 Oct 2022 15:01:48 +0200

move secrets to config file.  DB TBD

Diffstat:
M
docker/hybrid/config/deployment.conf
 | 
5
+++++
M
docker/hybrid/images/exchange/startup.sh
 | 
4
++--
M
docker/hybrid/images/libeufin/startup.sh
 | 
8
++++----
M
docker/hybrid/images/merchant/startup.sh
 | 
2
+-

4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/docker/hybrid/config/deployment.conf b/docker/hybrid/config/deployment.conf
@@ -1,2 +1,7 @@
 [taler-deployment]
 currency = EUR
+merchant-apikey = secret
+exchange-nexus-username = exchange-at-nexus
+exchange-nexus-password = secret-at-nexus
+exchange-sandbox-username = exchange-at-sandbox
+exchange-sandbox-password = secret-at-sandbox
diff --git a/docker/hybrid/images/exchange/startup.sh b/docker/hybrid/images/exchange/startup.sh
@@ -7,8 +7,8 @@ export LD_LIBRARY_PATH=/usr/local/lib
 CURRENCY=`taler-config -c /config/deployment.conf -s taler-deployment -o currency`
 EXCHANGE_URL="http://exchange/"
 
-EXCHANGE_NEXUS_USERNAME=exchange-at-nexus
-EXCHANGE_NEXUS_PASSWORD=x
+EXCHANGE_NEXUS_USERNAME=`taler-config -c /config/deployment.conf -s taler-deployment -o exchange-nexus-username`
+EXCHANGE_NEXUS_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o exchange-nexus-password`
 EXCHANGE_IBAN=DE159593
 TALER_FACADE_NAME=taler-facade
 
diff --git a/docker/hybrid/images/libeufin/startup.sh b/docker/hybrid/images/libeufin/startup.sh
@@ -56,8 +56,8 @@ libeufin-sandbox serve --no-localhost-only --port $SANDBOX_PORT &
 echo DONE
 is_serving ${LIBEUFIN_SANDBOX_URL} Sandbox
 
-EXCHANGE_SANDBOX_USERNAME=exchange-at-sandbox
-EXCHANGE_SANDBOX_PASSWORD=x
+EXCHANGE_SANDBOX_USERNAME=`taler-config -c /config/deployment.conf -s taler-deployment -o exchange-sandbox-username`
+EXCHANGE_SANDBOX_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o exchange-sandbox-password`
 echo -n "Register the Exchange at Sandbox..."
 register_sandbox_account $EXCHANGE_SANDBOX_USERNAME $EXCHANGE_SANDBOX_PASSWORD $EXCHANGE_IBAN "Exchange Company"
 echo DONE
@@ -75,8 +75,8 @@ libeufin-cli sandbox \
   --bank-account $EXCHANGE_SANDBOX_USERNAME
 echo DONE
 ## NEXUS SETUP
-EXCHANGE_NEXUS_USERNAME=exchange-at-nexus
-EXCHANGE_NEXUS_PASSWORD=x
+EXCHANGE_NEXUS_USERNAME=`taler-config -c /config/deployment.conf -s taler-deployment -o exchange-nexus-username`
+EXCHANGE_NEXUS_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o exchange-nexus-password`
 export LIBEUFIN_NEXUS_DB_CONNECTION="jdbc:sqlite:/data/nexus.sqlite3"
 echo -n "Creating Nexus superuser..."
 libeufin-nexus superuser $EXCHANGE_NEXUS_USERNAME --password $EXCHANGE_NEXUS_PASSWORD
diff --git a/docker/hybrid/images/merchant/startup.sh b/docker/hybrid/images/merchant/startup.sh
@@ -5,6 +5,7 @@ export LD_LIBRARY_PATH=/usr/local/lib
 
 # Values from config file mounted at run time:
 CURRENCY=`taler-config -c /config/deployment.conf -s taler-deployment -o currency`
+BACKEND_APIKEY=`taler-config -c /config/deployment.conf -s taler-deployment -o merchant-apikey`
 EXCHANGE_URL="http://exchange/"
 
 while ! pg_isready -h talerdb -d taler; do
@@ -37,7 +38,6 @@ for n in `seq 1 30`
   fi
 echo Echange reachable.
 
-BACKEND_APIKEY=secret
 EXCHANGE_MASTER_PUB=$(curl -s ${EXCHANGE_URL}keys | jq -r .master_public_key)
 echo Found Exchange Pub: $EXCHANGE_MASTER_PUB
 sed -i "s;__EXCHANGE_URL__;${EXCHANGE_URL};" /config/taler.conf