[taler-grid5k] 101/141: update merchant config

[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 7004eb0d88db091008733fa9033ae63084fc6cb9
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Nov 4 13:49:28 2021 +0100

    update merchant config
---
 configs/etc/taler/conf.d/merchant.conf |  7 +++++++
 docker/Dockerfile                      | 30 +++++++++++++++---------------
 experiment/scripts/merchant.sh         | 14 ++++++++++++++
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/configs/etc/taler/conf.d/merchant.conf 
b/configs/etc/taler/conf.d/merchant.conf
index 6293e34..b0ce84f 100644
--- a/configs/etc/taler/conf.d/merchant.conf
+++ b/configs/etc/taler/conf.d/merchant.conf
@@ -1,8 +1,15 @@
 @inline-secret@ merchantdb-postgres ../secrets/merchant-db.secret.conf
 
 [merchant]
+
 DATABASE = postgres
 SERVE = TCP
 PORT = 80
 
+[merchant-exchange-perf]
+
+EXCHANGE_BASE_URL = <EXCHANGE_URL_HERE>
+MASTER_KEY = <EXCHANGE_MASTER_KEY_HERE>
+CURRENCY = KUDOS
+
 @inline-matching@ ../merchant-overrides.conf
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5871b47..20a941d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -37,22 +37,22 @@ RUN apt update && \
         git \
         make \
         ruby-dev \
-       ruby-childprocess \
-       zstd \
-       libguestfs-tools \
-       linux-headers-amd64 \
-       socat \
-       qemu-utils \
-               ruby-dev \
-       ruby-childprocess \
-               pigz \
-       netcat \
-       eatmydata \
-       dirmngr \
-       gnupg \
-       gnupg-agent \
+        ruby-childprocess \
+        zstd \
+        libguestfs-tools \
+        linux-headers-amd64 \
+        socat \
+        qemu-utils \
+        ruby-dev \
+        ruby-childprocess \
+        pigz \
+        netcat \
+        eatmydata \
+        dirmngr \
+        gnupg \
+        gnupg-agent \
         expect \
-       rsync && \
+        rsync && \
     pip install jinja2 && \
     gem install kameleon-builder
 
diff --git a/experiment/scripts/merchant.sh b/experiment/scripts/merchant.sh
index 91f5cdd..eb04279 100755
--- a/experiment/scripts/merchant.sh
+++ b/experiment/scripts/merchant.sh
@@ -5,6 +5,18 @@ source ~/scripts/helpers.sh
 
 restart_rsyslog
 
+wait_for_keys "${PROXY_DOMAIN}"
+
+MASTER_KEY=$(
+  curl -k -f \
+     "${PROXY_DOMAIN}/keys" \
+     | jq -r '.master_public_key'
+)
+
+sed -i -e "s\<EXCHANGE_URL_HERE>\http://${EXCHANGE_DOMAIN}/\g"; \
+       -e "s/<EXCHANGE_MASTER_KEY_HERE>/${MASTER_KEY}/g"
+        /etc/taler/conf.d/merchant.conf
+
 systemctl restart postgres
 
 su postgres << EOF
@@ -16,4 +28,6 @@ psql -tAc "SELECT 1 FROM pg_database WHERE 
datname='taler-merchant'" | \
   createdb -O taler-merchant-httpd taler-merchant
 EOF
 
+sudo -u taler-merchant-httpd taler-merchant-dbinit
+
 systemctl restart taler-merchant-httpd

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