[taler-grid5k] 15/141: update scripts

[gnunet]

This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit 1954d4ca513e6dfa0409ac918f8de3716b417cd6
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sun Oct 3 21:47:48 2021 +0200

    update scripts
---
 jfed/env            |  4 +---
 scripts/exchange.sh | 11 ++++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/jfed/env b/jfed/env
index d095b5a..4d5bdfd 100755
--- a/jfed/env
+++ b/jfed/env
@@ -1,11 +1,9 @@
 DATABASE_HOSTS=
 EXCHANGE_HOSTS=
 BANK_HOSTS=
-DNS_HOST=
 WALLET_HOSTS=
 
-DB_HOST=
-BANK_HOST=
+DNS_HOST=
 
 DB_PORT=
 DB_NAME=
diff --git a/scripts/exchange.sh b/scripts/exchange.sh
index 1b2d8f5..05f173c 100755
--- a/scripts/exchange.sh
+++ b/scripts/exchange.sh
@@ -1,18 +1,19 @@
 #!/bin/bash
+set -eu
 
-sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}\g"
 \
+sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@${DATABASE_DOMAIN}:${DB_PORT}/${DB_NAME}\g"
 \
        /etc/taler/secrets/exchange-db.secret.conf
 
-sed -i "s/<BANK_HOST_HERE>/${BANK_HOST}/g" \
+sed -i "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
        /etc/taler/secrets/exchange-accountcredentials.secret.conf
-sed -i "s/<BANK_HOST_HERE>/${BANK_HOST}/g" \
+sed -i "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
        /etc/taler/conf.d/exchange-business.conf
 
 sudo -u taler-exchange-httpd taler-exchange-dbinit
 
 until PGPASSWORD="${DB_PASSWORD}" psql \
+      -h "${DATABASE_DOMAIN}" \
       -U "${DB_USER}" \
-      -h "${DB_HOST}" \
       -p "${DB_PORT}" \
       -d "${DB_NAME}" \
       -c '\q';
@@ -23,7 +24,7 @@ done
 
 
 su taler-exchange-httpd -s /bin/bash << EOF
-PGPASSWORD=${DB_PASSWORD} psql -U ${DB_USER} -h ${DB_HOST} -p ${DB_PORT} -d 
${DB_NAME}
+PGPASSWORD=${DB_PASSWORD} psql -h ${DATABASE_DOMAIN} -U ${DB_USER} -p 
${DB_PORT} -d ${DB_NAME}
 GRANT SELECT,INSERT,UPDATE ON ALL TABLES IN SCHEMA public TO 
"taler-exchange-aggregator";
 GRANT SELECT,INSERT,UPDATE ON ALL TABLES IN SCHEMA public TO 
"taler-exchange-closer";
 GRANT SELECT,INSERT,UPDATE ON ALL TABLES IN SCHEMA public TO 
"taler-exchange-wire";

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