[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-grid5k] 05/73: add configuration option for cmd prefix
From: |
gnunet |
Subject: |
[taler-grid5k] 05/73: add configuration option for cmd prefix |
Date: |
Tue, 14 Dec 2021 15:09:47 +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 96eb57a001448adf38588a62aba961f45a486b47
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Nov 24 17:20:07 2021 +0100
add configuration option for cmd prefix
---
configs/etc/default/taler-exchange | 1 -
.../system/taler-exchange-aggregator.service | 4 +--
.../systemd/system/taler-exchange-closer.service | 4 +--
.../systemd/system/taler-exchange-httpd.service | 4 +--
.../systemd/system/taler-exchange-httpd@.service | 4 +--
.../system/taler-exchange-secmod-eddsa.service | 4 +--
.../system/taler-exchange-secmod-rsa.service | 4 +--
.../systemd/system/taler-exchange-transfer.service | 4 +--
.../system/taler-exchange-wirewatch.service | 4 +--
.../system/taler-exchange-wirewatch@.service | 4 +--
.../usr/lib/systemd/system/taler-fakebank.service | 4 +--
experiment/env | 3 ++
experiment/scripts/helpers.sh | 28 +++++++++++++++++++
experiment/scripts/run.sh | 32 ++--------------------
experiment/scripts/setup.sh | 3 --
15 files changed, 53 insertions(+), 54 deletions(-)
diff --git a/configs/etc/default/taler-exchange
b/configs/etc/default/taler-exchange
deleted file mode 100644
index adcb212..0000000
--- a/configs/etc/default/taler-exchange
+++ /dev/null
@@ -1 +0,0 @@
-ARGS="<ARGUMENTS_HERE>"
diff --git a/configs/usr/lib/systemd/system/taler-exchange-aggregator.service
b/configs/usr/lib/systemd/system/taler-exchange-aggregator.service
index 44f4351..453b516 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-aggregator.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-aggregator.service
@@ -6,8 +6,8 @@ PartOf=taler-exchange.target
User=taler-exchange-aggregator
Type=simple
Restart=on-failure
-EnvironmentFile=/etc/default/taler-exchange
-ExecStart=/usr/bin/taler-exchange-aggregator -c /etc/taler/taler.conf $ARGS
+EnvironmentFile=/etc/environment
+ExecStart=/usr/bin/taler-exchange-aggregator -c /etc/taler/taler.conf
$EXCHANGE_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 f5bb6c6..5d060f2 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-closer.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-closer.service
@@ -6,8 +6,8 @@ PartOf=taler-exchange.target
User=taler-exchange-closer
Type=simple
Restart=on-failure
-EnvironmentFile=/etc/default/taler-exchange
-ExecStart=/usr/bin/taler-exchange-closer -c /etc/taler/taler.conf $ARGS
+EnvironmentFile=/etc/environment
+ExecStart=/usr/bin/taler-exchange-closer -c /etc/taler/taler.conf
$EXCHANGE_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 43a90c2..06dd156 100755
--- a/configs/usr/lib/systemd/system/taler-exchange-httpd.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-httpd.service
@@ -9,8 +9,8 @@ PartOf=taler-exchange.target
User=taler-exchange-httpd
Type=simple
Restart=on-failure
-EnvironmentFile=/etc/default/taler-exchange
-ExecStart=/usr/bin/taler-exchange-httpd -c /etc/taler/taler.conf $ARGS
+EnvironmentFile=/etc/environment
+ExecStart=$EXCHANGE_CMD_PREFIX /usr/bin/taler-exchange-httpd -c
/etc/taler/taler.conf $EXCHANGE_ARGS
StandardOutput=journal
StandardError=journal
PrivateTmp=no
diff --git a/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
b/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
index d6ee28d..43c7448 100755
--- a/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
@@ -9,8 +9,8 @@ PartOf=taler-exchange.target
User=taler-exchange-httpd
Type=simple
Restart=on-failure
-EnvironmentFile=/etc/default/taler-exchange
-ExecStart=/usr/bin/taler-exchange-httpd -c /etc/taler/taler.conf $ARGS
+EnvironmentFile=/etc/environment
+ExecStart=$EXCHANGE_CMD_PREFIX /usr/bin/taler-exchange-httpd -c
/etc/taler/taler.conf $EXCHANGE_ARGS
StandardOutput=journal
StandardError=journal
PrivateTmp=no
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 98d7ff0..eba283e 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-secmod-eddsa.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-secmod-eddsa.service
@@ -7,8 +7,8 @@ PartOf=taler-exchange.target
User=taler-exchange-secmod-eddsa
Type=simple
Restart=on-failure
-EnvironmentFile=/etc/default/taler-exchange
-ExecStart=/usr/bin/taler-exchange-secmod-eddsa -c /etc/taler/taler.conf $ARGS
+EnvironmentFile=/etc/environment
+ExecStart=/usr/bin/taler-exchange-secmod-eddsa -c /etc/taler/taler.conf
$EXCHANGE_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 fca5a3d..0265055 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-secmod-rsa.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-secmod-rsa.service
@@ -7,8 +7,8 @@ PartOf=taler-exchange.target
User=taler-exchange-secmod-rsa
Type=simple
Restart=on-failure
-EnvironmentFile=/etc/default/taler-exchange
-ExecStart=/usr/bin/taler-exchange-secmod-rsa -c /etc/taler/taler.conf $ARGS
+EnvironmentFile=/etc/environment
+ExecStart=/usr/bin/taler-exchange-secmod-rsa -c /etc/taler/taler.conf
$EXCHANGE_ARGS
StandardOutput=journal
StandardError=journal
PrivateTmp=no
diff --git a/configs/usr/lib/systemd/system/taler-exchange-transfer.service
b/configs/usr/lib/systemd/system/taler-exchange-transfer.service
index c8a2e9a..5b6ee2f 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-transfer.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-transfer.service
@@ -7,8 +7,8 @@ PartOf=taler-exchange.target
User=taler-exchange-wire
Type=simple
Restart=on-failure
-EnvironmentFile=/etc/default/taler-exchange
-ExecStart=/usr/bin/taler-exchange-transfer -c /etc/taler/taler.conf $ARGS
+EnvironmentFile=/etc/environment
+ExecStart=/usr/bin/taler-exchange-transfer -c /etc/taler/taler.conf
$EXCHANGE_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 f8ab764..9e948c4 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-wirewatch.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-wirewatch.service
@@ -7,8 +7,8 @@ PartOf=taler-exchange.target
User=taler-exchange-wire
Type=simple
Restart=on-failure
-EnvironmentFile=/etc/default/taler-exchange
-ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf $ARGS
+EnvironmentFile=/etc/environment
+ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf
$EXCHANGE_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 f8ab764..9e948c4 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-wirewatch@.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-wirewatch@.service
@@ -7,8 +7,8 @@ PartOf=taler-exchange.target
User=taler-exchange-wire
Type=simple
Restart=on-failure
-EnvironmentFile=/etc/default/taler-exchange
-ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf $ARGS
+EnvironmentFile=/etc/environment
+ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf
$EXCHANGE_ARGS
StandardOutput=journal
StandardError=journal
PrivateTmp=yes
diff --git a/configs/usr/lib/systemd/system/taler-fakebank.service
b/configs/usr/lib/systemd/system/taler-fakebank.service
index f81ad53..3e295a8 100644
--- a/configs/usr/lib/systemd/system/taler-fakebank.service
+++ b/configs/usr/lib/systemd/system/taler-fakebank.service
@@ -3,8 +3,8 @@ Description=GNU Taler fake bank
[Service]
Type=simple
-EnvironmentFile=/etc/default/taler-exchange
-ExecStart=/usr/bin/taler-fakebank-run -c /etc/taler/taler.conf -n 100 $ARGS
+EnvironmentFile=/etc/environment
+ExecStart=/usr/bin/taler-fakebank-run -c /etc/taler/taler.conf -n 100
$EXCHANGE_ARGS
StandardOutput=journal
StandardError=journal
diff --git a/experiment/env b/experiment/env
index cfc44c9..c461e81 100644
--- a/experiment/env
+++ b/experiment/env
@@ -19,6 +19,9 @@ MERCHANT_DOMAIN=merchant.${DNS_ZONE}
# Arguments to pass to taler-exchange-* binaries at startup.
EXCHANGE_ARGS="-L INFO"
+# Additional arguments to prepend to taler-exchange-httpd.service
+# files ExecStart command, e.g. valgrind --log-file=/tmp/exch%p.log
+EXCHANGE_CMD_PREFIX=""
# Datasource names registered in the grafana instance
PROMETHEUS_DATASOURCE_NAME=Prometheus
diff --git a/experiment/scripts/helpers.sh b/experiment/scripts/helpers.sh
index f7d4b19..ccfd12b 100755
--- a/experiment/scripts/helpers.sh
+++ b/experiment/scripts/helpers.sh
@@ -2,6 +2,34 @@
source ~/.env
+# Set a dynamic domain name in our own dns
+# argument: the domain to be added
+function set_ddn() {
+ nsupdate -v << EOF
+server ${DNS_HOSTS}
+zone ${DNS_ZONE}
+update add $1 3600 A $(hostname -I)
+send
+EOF
+}
+
+function set_host() {
+ echo "TALER_HOST=$1" >> /etc/environment
+ echo "TALER_HOST=$1" >> /root/.env
+ export "TALER_HOST=$1"
+}
+
+function enable_netdelay() {
+ sed -i "s/<PING_DESTINATION>/${1}/g" \
+ /usr/lib/systemd/system/taler-netdelay.service
+ systemctl daemon-reload
+ systemctl restart taler-netdelay.timer
+}
+
+function enable_logbackup() {
+ systemctl restart taler-logbackup.timer
+}
+
function wait_for_db() {
until PGPASSWORD="${DB_PASSWORD}" psql \
-h "${DATABASE_DOMAIN}" \
diff --git a/experiment/scripts/run.sh b/experiment/scripts/run.sh
index 03fc816..c0190da 100644
--- a/experiment/scripts/run.sh
+++ b/experiment/scripts/run.sh
@@ -1,36 +1,8 @@
#!/bin/bash
-# Run the experitment
-source ~/.env
-
+# Run the experiment
set -euax
-# Set a dynamic domain name in our own dns
-# argument: the domain to be added
-function set_ddn() {
- nsupdate -v << EOF
-server ${DNS_HOSTS}
-zone ${DNS_ZONE}
-update add $1 3600 A $(hostname -I)
-send
-EOF
-}
-
-function set_host() {
- echo "TALER_HOST=$1" >> /etc/environment
- echo "TALER_HOST=$1" >> /root/.env
- export "TALER_HOST=$1"
-}
-
-function enable_netdelay() {
- sed -i "s/<PING_DESTINATION>/${1}/g" \
- /usr/lib/systemd/system/taler-netdelay.service
- systemctl daemon-reload
- systemctl restart taler-netdelay.timer
-}
-
-function enable_logbackup() {
- systemctl restart taler-logbackup.timer
-}
+source ~/scripts/helpers.sh
if [[ "${ENABLE_EXPORTERS}" == "true" ]];
then
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index 7129ef3..0d8d145 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -68,9 +68,6 @@ sed -i -e "s/<MONITOR_DOMAIN_HERE>/${MONITOR_DOMAIN}/g" \
sed -i "s|<LOG_DIR_HERE>|${LOG_DIR}|g" \
/etc/logrotate.d/taler
-sed -i "s/<ARGUMENTS_HERE>/${EXCHANGE_ARGS}/g" \
- /etc/default/taler-exchange
-
if ! grep -Fxq "server=${NS_IP}" /etc/dnsmasq.conf ; then
echo "server=${NS_IP}" >> /etc/dnsmasq.conf
fi
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-grid5k] branch master updated (d6cc557 -> 0901fad), gnunet, 2021/12/14
- [taler-grid5k] 02/73: dns should work now, gnunet, 2021/12/14
- [taler-grid5k] 03/73: fix unbound variable in helper, gnunet, 2021/12/14
- [taler-grid5k] 05/73: add configuration option for cmd prefix,
gnunet <=
- [taler-grid5k] 04/73: run 'createuser' in image build - try to fix dmsasq issue, gnunet, 2021/12/14
- [taler-grid5k] 06/73: cleanup setup script - add completition, gnunet, 2021/12/14
- [taler-grid5k] 13/73: add first grafana exports, gnunet, 2021/12/14
- [taler-grid5k] 14/73: update dashboard exports, gnunet, 2021/12/14
- [taler-grid5k] 09/73: add config options for all exchange processes, gnunet, 2021/12/14
- [taler-grid5k] 01/73: working well unless dns, gnunet, 2021/12/14
- [taler-grid5k] 11/73: switch back to dahu, gnunet, 2021/12/14
- [taler-grid5k] 07/73: update doc in default env, gnunet, 2021/12/14
- [taler-grid5k] 33/73: add merchant to exporter, gnunet, 2021/12/14
- [taler-grid5k] 08/73: remove executable bits, gnunet, 2021/12/14