[taler-grid5k] 44/73: -resolve conflict

[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 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.