diff options
author | MS <ms@taler.net> | 2022-10-18 21:15:25 +0200 |
---|---|---|
committer | MS <ms@taler.net> | 2022-10-18 21:15:25 +0200 |
commit | 0d180d2737e3b031c586fac10c7975a8daf52a34 (patch) | |
tree | 8a9e4ef531fb5416386de86de8b76d0a7d3eeacd /docker/hybrid/images/merchant/startup.sh | |
parent | eb402ff6f74779f636734e10f4db85cba7900baf (diff) | |
download | deployment-0d180d2737e3b031c586fac10c7975a8daf52a34.tar.gz deployment-0d180d2737e3b031c586fac10c7975a8daf52a34.tar.bz2 deployment-0d180d2737e3b031c586fac10c7975a8daf52a34.zip |
remove unnecessary check
Diffstat (limited to 'docker/hybrid/images/merchant/startup.sh')
-rw-r--r-- | docker/hybrid/images/merchant/startup.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/hybrid/images/merchant/startup.sh b/docker/hybrid/images/merchant/startup.sh index 6a64d33..903f855 100644 --- 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 | \ |