[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-grid5k] 44/73: -resolve conflict
From: |
gnunet |
Subject: |
[taler-grid5k] 44/73: -resolve conflict |
Date: |
Tue, 14 Dec 2021 15:10:26 +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 57a6288ddc033917e08cf5435fd30adbbef62773
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Dec 2 08:03:37 2021 +0100
-resolve conflict
---
configs/usr/lib/systemd/system/taler-exchange-httpd.service | 4 +++-
configs/usr/lib/systemd/system/taler-exchange-httpd@.service | 3 +++
configs/usr/lib/systemd/system/taler-exchange-wirewatch@.service | 3 ++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/configs/usr/lib/systemd/system/taler-exchange-httpd.service
b/configs/usr/lib/systemd/system/taler-exchange-httpd.service
index 2df2697..8be8049 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-httpd.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-httpd.service
@@ -8,7 +8,10 @@ PartOf=taler-exchange.target
[Service]
User=taler-exchange-httpd
Type=simple
+# Depending on the configuration, the service suicides and then
+# needs to be restarted.
Restart=always
+# Do not dally on restarts.
RestartSec=1ms
EnvironmentFile=/etc/environment
ExecStart=<CMD_PREFIX_HERE>/usr/bin/taler-exchange-httpd -c
/etc/taler/taler.conf $TALER_ARGS $EXCHANGE_ARGS
@@ -20,4 +23,3 @@ ProtectSystem=full
[Install]
WantedBy=multi-user.target
-
diff --git a/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
b/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
index 3f51bcc..03477ad 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-httpd@.service
@@ -8,7 +8,10 @@ PartOf=taler-exchange.target
[Service]
User=taler-exchange-httpd
Type=simple
+# Depending on the configuration, the service suicides and then
+# needs to be restarted.
Restart=always
+# Do not dally on restarts.
RestartSec=1ms
EnvironmentFile=/etc/environment
ExecStart=<CMD_PREFIX_HERE>/usr/bin/taler-exchange-httpd -c
/etc/taler/taler.conf $TALER_ARGS $EXCHANGE_ARGS
diff --git a/configs/usr/lib/systemd/system/taler-exchange-wirewatch@.service
b/configs/usr/lib/systemd/system/taler-exchange-wirewatch@.service
index 7efe7de..6c98764 100644
--- a/configs/usr/lib/systemd/system/taler-exchange-wirewatch@.service
+++ b/configs/usr/lib/systemd/system/taler-exchange-wirewatch@.service
@@ -6,7 +6,8 @@ PartOf=taler-exchange.target
[Service]
User=taler-exchange-wire
Type=simple
-Restart=on-failure
+Restart=always
+RestartSec=100ms
EnvironmentFile=/etc/environment
ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf
$TALER_ARGS $WIREWATCH_ARGS
StandardOutput=journal
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-grid5k] 15/73: build wallet from source since dist does not work, (continued)
- [taler-grid5k] 15/73: build wallet from source since dist does not work, gnunet, 2021/12/14
- [taler-grid5k] 25/73: enable postgres-exporter again, gnunet, 2021/12/14
- [taler-grid5k] 29/73: switch to transaction mode since otherwise its all the same as when pgbouncer not used at all, gnunet, 2021/12/14
- [taler-grid5k] 23/73: disable pgbouncer per default, gnunet, 2021/12/14
- [taler-grid5k] 52/73: possible to configure max_requests with env file, gnunet, 2021/12/14
- [taler-grid5k] 22/73: add pgbouncer, tune pg config, gnunet, 2021/12/14
- [taler-grid5k] 16/73: fix wallet build - broken on master, gnunet, 2021/12/14
- [taler-grid5k] 61/73: refactor db.sh, gnunet, 2021/12/14
- [taler-grid5k] 30/73: increase default pool size, gnunet, 2021/12/14
- [taler-grid5k] 43/73: update config of db and exch, gnunet, 2021/12/14
- [taler-grid5k] 44/73: -resolve conflict,
gnunet <=
- [taler-grid5k] 41/73: update installer script, gnunet, 2021/12/14
- [taler-grid5k] 54/73: enable huge_pages, implement exchange scrape logic, gnunet, 2021/12/14
- [taler-grid5k] 48/73: update install script, gnunet, 2021/12/14
- [taler-grid5k] 37/73: bootstrap seems to work with sudo, gnunet, 2021/12/14
- [taler-grid5k] 47/73: fix stupid bug and fix arguments for bank, gnunet, 2021/12/14
- [taler-grid5k] 55/73: db disk mount, gnunet, 2021/12/14
- [taler-grid5k] 42/73: fix setup.sh, gnunet, 2021/12/14
- [taler-grid5k] 50/73: note about postgres huge pages, gnunet, 2021/12/14
- [taler-grid5k] 39/73: fix typo, gnunet, 2021/12/14
- [taler-grid5k] 60/73: fix logbackup so it gets rotated correctly, gnunet, 2021/12/14