taler-deployment

commit 0d180d2737e3b031c586fac10c7975a8daf52a34
parent eb402ff6f74779f636734e10f4db85cba7900baf
Author: MS <ms@taler.net>
Date:   Tue, 18 Oct 2022 21:15:25 +0200

remove unnecessary check

Diffstat:
M
docker/hybrid/docker-compose.yml
 | 
2
+-
M
docker/hybrid/images/exchange/startup.sh
 | 
3
---
M
docker/hybrid/images/merchant/startup.sh
 | 
4
+++-
M
docker/hybrid/images/merchant/taler.conf
 | 
2
+-

4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/docker/hybrid/docker-compose.yml b/docker/hybrid/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - ${TALER_DEPLOYMENT_CONFIG:?Please export TALER_DEPLOYMENT_CONFIG}:/config/deployment.conf
     environment:
       POSTGRES_USER: root
-      POSTGRES_PASSWORD: nonce
+      POSTGRES_PASSWORD: nonce # changed after init.
       POSTGRES_HOST_AUTH_METHOD: scram-sha-256
 
   exchange:
diff --git a/docker/hybrid/images/exchange/startup.sh b/docker/hybrid/images/exchange/startup.sh
@@ -27,9 +27,6 @@ while ! pg_isready -h talerdb -d taler; do
 done
 echo Now DB is ready.
 
-# Make sure we have the right to connect
-echo "" | psql -h talerdb -d taler
-
 taler-exchange-dbinit -L DEBUG -c /config/taler.conf --reset
 
 taler-exchange-secmod-eddsa -L DEBUG \
diff --git a/docker/hybrid/images/merchant/startup.sh b/docker/hybrid/images/merchant/startup.sh
@@ -7,6 +7,7 @@ export LD_LIBRARY_PATH=/usr/local/lib
 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/"
+DB_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o db-password`
 
 while ! pg_isready -h talerdb -d taler; do
   echo DB not ready yet.
@@ -44,8 +45,9 @@ sed -i "s;__EXCHANGE_URL__;${EXCHANGE_URL};" /config/taler.conf
 sed -i "s/__EXCHANGE_PUB__/${EXCHANGE_MASTER_PUB}/" /config/taler.conf
 sed -i "s/__CURRENCY__/${CURRENCY}/" /config/taler.conf
 sed -i "s/__BACKEND_APIKEY__/${BACKEND_APIKEY}/" /config/taler.conf
+sed -i "s;__DB_PASSWORD__;${DB_PASSWORD};" /config/taler.conf
 echo -n "Reset database..."
-taler-merchant-dbinit -L DEBUG -c /config/taler.conf --reset 2>&1
+taler-merchant-dbinit -L DEBUG -c /config/taler.conf --reset
 echo DONE
 echo -n "Launch merchant backend..."
 taler-merchant-httpd -c /config/taler.conf 2>&1 | \
diff --git a/docker/hybrid/images/merchant/taler.conf b/docker/hybrid/images/merchant/taler.conf
@@ -10,7 +10,7 @@ exchange_base_url = __EXCHANGE_URL__
 master_key = __EXCHANGE_PUB__
 
 [merchantdb-postgres]
-config = postgres://talerdb/taler
+config = postgres://root:__DB_PASSWORD__@talerdb/taler
 
 [merchant]
 default_max_deposit_fee = __CURRENCY__:0.05