[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-grid5k] 101/141: update merchant config
From: |
gnunet |
Subject: |
[taler-grid5k] 101/141: update merchant config |
Date: |
Thu, 18 Nov 2021 14:50:42 +0100 |
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.
- [taler-grid5k] 87/141: fix timer to every five minutes, (continued)
- [taler-grid5k] 87/141: fix timer to every five minutes, gnunet, 2021/11/18
- [taler-grid5k] 114/141: update configs, gnunet, 2021/11/18
- [taler-grid5k] 115/141: split rspec, change tags, gnunet, 2021/11/18
- [taler-grid5k] 77/141: update image build, gnunet, 2021/11/18
- [taler-grid5k] 128/141: add sanitizer and disable optimizer, gnunet, 2021/11/18
- [taler-grid5k] 100/141: update docker README, gnunet, 2021/11/18
- [taler-grid5k] 130/141: update image, gnunet, 2021/11/18
- [taler-grid5k] 134/141: resolved does not work, switch back, gnunet, 2021/11/18
- [taler-grid5k] 123/141: update per stream limit in loki, gnunet, 2021/11/18
- [taler-grid5k] 113/141: tune postgres config, gnunet, 2021/11/18
- [taler-grid5k] 101/141: update merchant config,
gnunet <=
- [taler-grid5k] 111/141: move expect to top for pipeline to fail if not successful, gnunet, 2021/11/18
- [taler-grid5k] 125/141: change permissions, gnunet, 2021/11/18
- [taler-grid5k] 74/141: install nodejs permanently, gnunet, 2021/11/18
- [taler-grid5k] 76/141: modify nginx settings, gnunet, 2021/11/18
- [taler-grid5k] 141/141: Node setup complete - multiple projects because of allocation bug in jFed, gnunet, 2021/11/18
- [taler-grid5k] 122/141: remove directories of taler after install, gnunet, 2021/11/18
- [taler-grid5k] 121/141: cut log size of proxy, gnunet, 2021/11/18
- [taler-grid5k] 109/141: update loki version, gnunet, 2021/11/18
- [taler-grid5k] 91/141: change ts in proxy logs, gnunet, 2021/11/18
- [taler-grid5k] 84/141: set envfile in netdelay service, gnunet, 2021/11/18