[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-grid5k] 129/141: add config vor exchange via environment
From: |
gnunet |
Subject: |
[taler-grid5k] 129/141: add config vor exchange via environment |
Date: |
Thu, 18 Nov 2021 14:51:10 +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 346d08bc4f0412cb0cbc611f26d77f78640e9552
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sat Nov 13 13:09:10 2021 +0100
add config vor exchange via environment
---
configs/etc/default/taler-exchange | 1 +
configs/etc/default/taler-exchange-httpd | 1 -
configs/etc/default/taler-exchange-secmod-rsa | 1 -
.../systemd/system/taler-exchange-aggregator.service | 3 ++-
.../lib/systemd/system/taler-exchange-closer.service | 3 ++-
.../usr/lib/systemd/system/taler-exchange-httpd.service | 2 +-
.../systemd/system/taler-exchange-secmod-eddsa.service | 3 ++-
.../systemd/system/taler-exchange-secmod-rsa.service | 2 +-
.../lib/systemd/system/taler-exchange-transfer.service | 3 ++-
.../lib/systemd/system/taler-exchange-wirewatch.service | 3 ++-
experiment/env | 2 ++
experiment/scripts/benchmark.sh | 17 +++++++++--------
experiment/setup.sh | 3 +++
13 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/configs/etc/default/taler-exchange
b/configs/etc/default/taler-exchange
new file mode 100644
index 0000000..adcb212
--- /dev/null
+++ b/configs/etc/default/taler-exchange
@@ -0,0 +1 @@
+ARGS="<ARGUMENTS_HERE>"
diff --git a/configs/etc/default/taler-exchange-httpd
b/configs/etc/default/taler-exchange-httpd
deleted file mode 100644
index 69281ec..0000000
--- a/configs/etc/default/taler-exchange-httpd
+++ /dev/null
@@ -1 +0,0 @@
-ARGS="-L DEBUG"
diff --git a/configs/etc/default/taler-exchange-secmod-rsa
b/configs/etc/default/taler-exchange-secmod-rsa
deleted file mode 100644
index 99052e7..0000000
--- a/configs/etc/default/taler-exchange-secmod-rsa
+++ /dev/null
@@ -1 +0,0 @@
-ARGS="-L INFO"
diff --git a/configs/usr/lib/systemd/system/taler-exchange-aggregator.service
b/configs/usr/lib/systemd/system/taler-exchange-aggregator.service
index d0fcbf6..44f4351 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-aggregator.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-aggregator.service
@@ -6,7 +6,8 @@ PartOf=taler-exchange.target
User=taler-exchange-aggregator
Type=simple
Restart=on-failure
-ExecStart=/usr/bin/taler-exchange-aggregator -c /etc/taler/taler.conf
+EnvironmentFile=/etc/default/taler-exchange
+ExecStart=/usr/bin/taler-exchange-aggregator -c /etc/taler/taler.conf $ARGS
StandardOutput=journal
StandardError=journal
PrivateTmp=yes
diff --git a/configs/usr/lib/systemd/system/taler-exchange-closer.service
b/configs/usr/lib/systemd/system/taler-exchange-closer.service
index c1e6619..f5bb6c6 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-closer.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-closer.service
@@ -6,7 +6,8 @@ PartOf=taler-exchange.target
User=taler-exchange-closer
Type=simple
Restart=on-failure
-ExecStart=/usr/bin/taler-exchange-closer -c /etc/taler/taler.conf -L DEBUG
+EnvironmentFile=/etc/default/taler-exchange
+ExecStart=/usr/bin/taler-exchange-closer -c /etc/taler/taler.conf $ARGS
StandardOutput=journal
StandardError=journal
PrivateTmp=yes
diff --git a/configs/usr/lib/systemd/system/taler-exchange-httpd.service
b/configs/usr/lib/systemd/system/taler-exchange-httpd.service
index 2689816..43a90c2 100755
--- a/configs/usr/lib/systemd/system/taler-exchange-httpd.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-httpd.service
@@ -9,7 +9,7 @@ PartOf=taler-exchange.target
User=taler-exchange-httpd
Type=simple
Restart=on-failure
-EnvironmentFile=/etc/default/taler-exchange-httpd
+EnvironmentFile=/etc/default/taler-exchange
ExecStart=/usr/bin/taler-exchange-httpd -c /etc/taler/taler.conf $ARGS
StandardOutput=journal
StandardError=journal
diff --git a/configs/usr/lib/systemd/system/taler-exchange-secmod-eddsa.service
b/configs/usr/lib/systemd/system/taler-exchange-secmod-eddsa.service
index a609f60..98d7ff0 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-secmod-eddsa.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-secmod-eddsa.service
@@ -7,7 +7,8 @@ PartOf=taler-exchange.target
User=taler-exchange-secmod-eddsa
Type=simple
Restart=on-failure
-ExecStart=/usr/bin/taler-exchange-secmod-eddsa -c /etc/taler/taler.conf -L
DEBUG
+EnvironmentFile=/etc/default/taler-exchange
+ExecStart=/usr/bin/taler-exchange-secmod-eddsa -c /etc/taler/taler.conf $ARGS
StandardOutput=journal
StandardError=journal
PrivateTmp=no
diff --git a/configs/usr/lib/systemd/system/taler-exchange-secmod-rsa.service
b/configs/usr/lib/systemd/system/taler-exchange-secmod-rsa.service
index e6df6a1..fca5a3d 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-secmod-rsa.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-secmod-rsa.service
@@ -7,7 +7,7 @@ PartOf=taler-exchange.target
User=taler-exchange-secmod-rsa
Type=simple
Restart=on-failure
-EnvironmentFile=/etc/default/taler-exchange-secmod-rsa
+EnvironmentFile=/etc/default/taler-exchange
ExecStart=/usr/bin/taler-exchange-secmod-rsa -c /etc/taler/taler.conf $ARGS
StandardOutput=journal
StandardError=journal
diff --git a/configs/usr/lib/systemd/system/taler-exchange-transfer.service
b/configs/usr/lib/systemd/system/taler-exchange-transfer.service
index f2a4405..c8a2e9a 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-transfer.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-transfer.service
@@ -7,7 +7,8 @@ PartOf=taler-exchange.target
User=taler-exchange-wire
Type=simple
Restart=on-failure
-ExecStart=/usr/bin/taler-exchange-transfer -c /etc/taler/taler.conf -L DEBUG
+EnvironmentFile=/etc/default/taler-exchange
+ExecStart=/usr/bin/taler-exchange-transfer -c /etc/taler/taler.conf $ARGS
StandardOutput=journal
StandardError=journal
PrivateTmp=yes
diff --git a/configs/usr/lib/systemd/system/taler-exchange-wirewatch.service
b/configs/usr/lib/systemd/system/taler-exchange-wirewatch.service
index 88fbae1..f8ab764 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-wirewatch.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-wirewatch.service
@@ -7,7 +7,8 @@ PartOf=taler-exchange.target
User=taler-exchange-wire
Type=simple
Restart=on-failure
-ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf -L DEBUG
+EnvironmentFile=/etc/default/taler-exchange
+ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf $ARGS
StandardOutput=journal
StandardError=journal
PrivateTmp=yes
diff --git a/experiment/env b/experiment/env
index 305f45d..e0512d8 100755
--- a/experiment/env
+++ b/experiment/env
@@ -19,6 +19,8 @@ MERCHANT_DOMAIN=merch.perf.taler
# Wallet domain is also needed for cleardns.sh
WALLET_DOMAIN=wallet.x.perf.taler
+EXCHANGE_ARGS="-L INFO"
+
PROMETHEUS_DATASOURCE_NAME=Prometheus
LOKI_DATASOURCE_NAME=Loki
diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index 649dd63..c02b48d 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -11,12 +11,13 @@ esac
taler-wallet-cli \
-L ${LOG_LEVEL} \
advanced bench1 \
- --config-json "
+ --config-json '
{
- \"exchange\": \"http://${PROXY_DOMAIN}/\",
- \"bank\": \"http://${BANK_DOMAIN}/\",
- \"currency\": \"KUDOS\",
- \"payto\": \"payto://x-taler-bank/${BANK_DOMAIN}/foo\",
- \"iterations\": 100000,
- \"deposits\": 10
-}"
+ "exchange": "http://${PROXY_DOMAIN}/",
+ "bank": "http://${BANK_DOMAIN}/",
+ "currency": "KUDOS",
+ "payto": "payto://x-taler-bank/${BANK_DOMAIN}/foo",
+ "iterations": 100000,
+ "deposits": 10,
+ "restartWallet": 20
+}'
diff --git a/experiment/setup.sh b/experiment/setup.sh
index f27e03c..e99649f 100644
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -24,6 +24,9 @@ cp -r "${G5K_HOME}"/configs/* /
sed -i "s/<MONITOR_DOMAIN_HERE>/${MONITOR_DOMAIN}/g" \
/etc/rsyslog.d/taler.conf
+sed -i "s/<ARGUMENTS_HERE>/${EXCHANGE_ARGS}/g" \
+ /etc/default/taler-exchange
+
# Add the dyndns key which will be used by the dns update
cat << EOF > /root/ddns.key
key "ddns-key.perf.taler" {
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-grid5k] 37/141: update image, (continued)
- [taler-grid5k] 37/141: update image, gnunet, 2021/11/18
- [taler-grid5k] 51/141: add tests with parallel, gnunet, 2021/11/18
- [taler-grid5k] 55/141: add possibilty for dynamic amount of wallets, gnunet, 2021/11/18
- [taler-grid5k] 133/141: use systemd-resolved instead of dnsmasq, gnunet, 2021/11/18
- [taler-grid5k] 97/141: fix variables in image script, gnunet, 2021/11/18
- [taler-grid5k] 96/141: fix merchant path, gnunet, 2021/11/18
- [taler-grid5k] 82/141: add ping, gnunet, 2021/11/18
- [taler-grid5k] 117/141: start processes with argument to script, gnunet, 2021/11/18
- [taler-grid5k] 103/141: update wallet domain name settings, gnunet, 2021/11/18
- [taler-grid5k] 127/141: add log backup, gnunet, 2021/11/18
- [taler-grid5k] 129/141: add config vor exchange via environment,
gnunet <=
- [taler-grid5k] 140/141: move to master for wallet, enable logbackup for bank, gnunet, 2021/11/18
- [taler-grid5k] 108/141: fix variable names, gnunet, 2021/11/18
- [taler-grid5k] 138/141: re-enable sanitizer, gnunet, 2021/11/18
- [taler-grid5k] 119/141: update espec - add taler-perf utility, gnunet, 2021/11/18
- [taler-grid5k] 126/141: add log backup and update dns config for nfs, gnunet, 2021/11/18
- [taler-grid5k] 124/141: use kameleon nfs image, gnunet, 2021/11/18
- [taler-grid5k] 118/141: add wirewatch systemd template, gnunet, 2021/11/18
- [taler-grid5k] 102/141: update merchant configuration, gnunet, 2021/11/18
- [taler-grid5k] 79/141: fix wallet build, gnunet, 2021/11/18
- [taler-grid5k] 112/141: no doc for gem, gnunet, 2021/11/18