[taler-grid5k] 21/141: remove default pg port

[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 d098f8f43e6c2b4d4e673239b0783b304d8b7491
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Mon Oct 4 00:26:10 2021 +0200

    remove default pg port
---
 jfed/env            | 1 -
 scripts/bank.sh     | 2 ++
 scripts/dns.sh      | 2 ++
 scripts/exchange.sh | 7 ++++---
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jfed/env b/jfed/env
index 4d5bdfd..475bf55 100755
--- a/jfed/env
+++ b/jfed/env
@@ -5,7 +5,6 @@ WALLET_HOSTS=
 
 DNS_HOST=
 
-DB_PORT=
 DB_NAME=
 DB_USER=
 DB_PASSWORD=
diff --git a/scripts/bank.sh b/scripts/bank.sh
index 7052dec..e0b21da 100755
--- a/scripts/bank.sh
+++ b/scripts/bank.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
 taler-fakebank-run -c /etc/taler/taler.conf 2>&1 > bank.log & disown
+
+exit 0
diff --git a/scripts/dns.sh b/scripts/dns.sh
index 38c45e9..ba8a8db 100755
--- a/scripts/dns.sh
+++ b/scripts/dns.sh
@@ -4,3 +4,5 @@ sed -i "s/<DNS_KEY_HERE>/${DNS_HMAC_SHA256}/g" \
     /etc/bind/named.conf.local
 
 systemctl start named.service
+
+exit 0
diff --git a/scripts/exchange.sh b/scripts/exchange.sh
index c5c575c..957046a 100755
--- a/scripts/exchange.sh
+++ b/scripts/exchange.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu
 
-sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@${DATABASE_DOMAIN}:${DB_PORT}/${DB_NAME}\g"
 \
+sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@${DATABASE_DOMAIN}/${DB_NAME}\g"
 \
        /etc/taler/secrets/exchange-db.secret.conf
 
 sed -i "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
@@ -12,7 +12,6 @@ sed -i "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
 until PGPASSWORD="${DB_PASSWORD}" psql \
       -h "${DATABASE_DOMAIN}" \
       -U "${DB_USER}" \
-      -p "${DB_PORT}" \
       -d "${DB_NAME}" \
       -c '\q';
 do
@@ -23,7 +22,7 @@ done
 sudo -u taler-exchange-httpd taler-exchange-dbinit
 
 su taler-exchange-httpd -s /bin/bash << EOF
-PGPASSWORD=${DB_PASSWORD} psql -h ${DATABASE_DOMAIN} -U ${DB_USER} -p 
${DB_PORT} -d ${DB_NAME}
+PGPASSWORD=${DB_PASSWORD} psql -h ${DATABASE_DOMAIN} -U ${DB_USER} -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";
@@ -42,3 +41,5 @@ sed -i "s\<BASE_URL_HERE>\http://$(hostname)\g" \
 systemctl start taler-exchange.target nginx
 
 wget http://$(hostname)/management/keys
+
+exit 0

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