summaryrefslogtreecommitdiff
path: root/docker/merchant
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2017-01-05 13:32:22 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2017-01-05 13:32:22 +0100
commita58f4ca09fbdb2d265b7db577627cae71a3a2531 (patch)
tree2902c395028fe2c9e590abf056406a8a4981c53b /docker/merchant
parent9256f62a39c4daf520a4eb36356e3293e106b5a1 (diff)
downloaddeployment-a58f4ca09fbdb2d265b7db577627cae71a3a2531.tar.gz
deployment-a58f4ca09fbdb2d265b7db577627cae71a3a2531.tar.bz2
deployment-a58f4ca09fbdb2d265b7db577627cae71a3a2531.zip
No newline after master key
Diffstat (limited to 'docker/merchant')
-rwxr-xr-xdocker/merchant/entry_point.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/merchant/entry_point.sh b/docker/merchant/entry_point.sh
index 3cd01fb..89df95c 100755
--- a/docker/merchant/entry_point.sh
+++ b/docker/merchant/entry_point.sh
@@ -7,7 +7,7 @@ taler-config -s merchantdb-postgres -o config \
-V "dbname=talertest host=dbcontainer"
taler-config -s merchant -o serve -V tcp
taler-config -s merchant -o port -V 9966
-taler-config -s merchant-exchange-test -o master_key -V $(cat ./exchange_pub.txt)
-taler-config -s merchant-exchange-test -o uri -V $(cat ./exchange_uri.txt)
+taler-config -s merchant-exchange-test -o master_key -V $(cat ./exchange_pub.txt|tr -d '\n')
+taler-config -s merchant-exchange-test -o uri -V $(cat ./exchange_uri.txt | tr -d '\n')
taler-merchant-dbinit -r
taler-merchant-httpd