[taler-deployment] 03/03: backend url in config

[gnunet]

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

ms pushed a commit to branch master
in repository deployment.

commit f8e3b1643c1be100cdd65cddc8e305a9dd916055
Author: MS <ms@taler.net>
AuthorDate: Thu Oct 27 16:17:55 2022 +0200

    backend url in config
---
 docker/hybrid/config/deployment.conf     | 1 +
 docker/hybrid/images/merchant/startup.sh | 2 ++
 docker/hybrid/images/merchant/taler.conf | 3 +--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker/hybrid/config/deployment.conf 
b/docker/hybrid/config/deployment.conf
index fb3e5c0..6b4d052 100644
--- a/docker/hybrid/config/deployment.conf
+++ b/docker/hybrid/config/deployment.conf
@@ -1,6 +1,7 @@
 [taler-deployment]
 currency = EUR
 merchant-apikey = secret
+merchant-url = http://localhost:5556/
 exchange-nexus-username = exchange-at-nexus
 exchange-nexus-password = secret-at-nexus
 
diff --git a/docker/hybrid/images/merchant/startup.sh 
b/docker/hybrid/images/merchant/startup.sh
index 49dcff1..ddf3af2 100644
--- a/docker/hybrid/images/merchant/startup.sh
+++ b/docker/hybrid/images/merchant/startup.sh
@@ -6,6 +6,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`
+BACKEND_URL=`taler-config -c /config/deployment.conf -s taler-deployment -o 
merchant-url`
 EXCHANGE_URL="http://exchange/";
 DB_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o 
db-password`
 
@@ -63,6 +64,7 @@ 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/__BACKEND_URL__/${BACKEND_URL}/" /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
diff --git a/docker/hybrid/images/merchant/taler.conf 
b/docker/hybrid/images/merchant/taler.conf
index 6e282e3..a85510e 100644
--- a/docker/hybrid/images/merchant/taler.conf
+++ b/docker/hybrid/images/merchant/taler.conf
@@ -23,7 +23,6 @@ serve = tcp
 wire_file_mode = 770
 wire_response = ${TALER_DATA_HOME}/merchant/wire/merchant.json
 
-# Unused yet.
 [frontends]
-backend = http://localhost:5556/
+backend = __BACKEND_URL__
 backend_apikey = __BACKEND_APIKEY__

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