From f5578aa80ebc5fcf7e1a7860bdc83c886f0a63fe Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 8 Jan 2024 16:35:13 +0100 Subject: modify systemd for #8030: honor do-not-restart exit code --- debian/taler-auditor.taler-auditor-httpd.service | 1 + debian/taler-exchange.taler-exchange-aggregator.service | 1 + debian/taler-exchange.taler-exchange-aggregator@.service | 1 + debian/taler-exchange.taler-exchange-closer.service | 1 + debian/taler-exchange.taler-exchange-expire.service | 1 + debian/taler-exchange.taler-exchange-httpd.service | 1 + debian/taler-exchange.taler-exchange-httpd@.service | 1 + debian/taler-exchange.taler-exchange-secmod-cs.service | 1 + debian/taler-exchange.taler-exchange-secmod-eddsa.service | 2 +- debian/taler-exchange.taler-exchange-secmod-rsa.service | 1 + debian/taler-exchange.taler-exchange-transfer.service | 1 + debian/taler-exchange.taler-exchange-wirewatch.service | 1 + debian/taler-exchange.taler-exchange-wirewatch@.service | 1 + 13 files changed, 13 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/taler-auditor.taler-auditor-httpd.service b/debian/taler-auditor.taler-auditor-httpd.service index 9aefab641..e65afd9c7 100644 --- a/debian/taler-auditor.taler-auditor-httpd.service +++ b/debian/taler-auditor.taler-auditor-httpd.service @@ -6,6 +6,7 @@ After=postgres.service network.target User=taler-auditor-httpd Type=simple Restart=on-failure +RestartPreventExitStatus=9 ExecStart=/usr/bin/taler-auditor-httpd -c /etc/taler/taler.conf [Install] diff --git a/debian/taler-exchange.taler-exchange-aggregator.service b/debian/taler-exchange.taler-exchange-aggregator.service index 246cad5c1..095945981 100644 --- a/debian/taler-exchange.taler-exchange-aggregator.service +++ b/debian/taler-exchange.taler-exchange-aggregator.service @@ -8,6 +8,7 @@ User=taler-exchange-aggregator Type=simple Restart=always RestartSec=1s +RestartPreventExitStatus=9 ExecStart=/usr/bin/taler-exchange-aggregator -c /etc/taler/taler.conf StandardOutput=journal StandardError=journal diff --git a/debian/taler-exchange.taler-exchange-aggregator@.service b/debian/taler-exchange.taler-exchange-aggregator@.service index bfc44a9a9..2379b3e76 100644 --- a/debian/taler-exchange.taler-exchange-aggregator@.service +++ b/debian/taler-exchange.taler-exchange-aggregator@.service @@ -7,6 +7,7 @@ User=taler-exchange-aggregator Type=simple Restart=always RestartSec=1s +RestartPreventExitStatus=9 ExecStart=/usr/bin/taler-exchange-aggregator -c /etc/taler/taler.conf StandardOutput=journal StandardError=journal diff --git a/debian/taler-exchange.taler-exchange-closer.service b/debian/taler-exchange.taler-exchange-closer.service index 97a385c13..ab9c6d98f 100644 --- a/debian/taler-exchange.taler-exchange-closer.service +++ b/debian/taler-exchange.taler-exchange-closer.service @@ -8,6 +8,7 @@ User=taler-exchange-closer Type=simple Restart=always RestartSec=1s +RestartPreventExitStatus=9 ExecStart=/usr/bin/taler-exchange-closer -c /etc/taler/taler.conf StandardOutput=journal StandardError=journal diff --git a/debian/taler-exchange.taler-exchange-expire.service b/debian/taler-exchange.taler-exchange-expire.service index 250f210fe..a34cdccb7 100644 --- a/debian/taler-exchange.taler-exchange-expire.service +++ b/debian/taler-exchange.taler-exchange-expire.service @@ -8,6 +8,7 @@ User=taler-exchange-expire Type=simple Restart=always RestartSec=1s +RestartPreventExitStatus=9 ExecStart=/usr/bin/taler-exchange-expire -c /etc/taler/taler.conf StandardOutput=journal StandardError=journal diff --git a/debian/taler-exchange.taler-exchange-httpd.service b/debian/taler-exchange.taler-exchange-httpd.service index 3671bdc7d..2a4cf72e4 100644 --- a/debian/taler-exchange.taler-exchange-httpd.service +++ b/debian/taler-exchange.taler-exchange-httpd.service @@ -13,6 +13,7 @@ Type=simple # needs to be restarted. Thus no significant delay on restarts. Restart=always RestartSec=1ms +RestartPreventExitStatus=9 # Disable the service if more than 5 restarts are encountered within 5s. # These are usually the systemd defaults, but can be overwritten, thus we set diff --git a/debian/taler-exchange.taler-exchange-httpd@.service b/debian/taler-exchange.taler-exchange-httpd@.service index e0246899c..646acd6aa 100644 --- a/debian/taler-exchange.taler-exchange-httpd@.service +++ b/debian/taler-exchange.taler-exchange-httpd@.service @@ -14,6 +14,7 @@ Type=simple Restart=always # Do not dally on restarts. RestartSec=1ms +RestartPreventExitStatus=9 EnvironmentFile=/etc/environment ExecStart=/usr/bin/taler-exchange-httpd -c /etc/taler/taler.conf StandardOutput=journal diff --git a/debian/taler-exchange.taler-exchange-secmod-cs.service b/debian/taler-exchange.taler-exchange-secmod-cs.service index 3b5e0745d..edbebac0f 100644 --- a/debian/taler-exchange.taler-exchange-secmod-cs.service +++ b/debian/taler-exchange.taler-exchange-secmod-cs.service @@ -8,6 +8,7 @@ User=taler-exchange-secmod-cs Type=simple Restart=always RestartSec=100ms +RestartPreventExitStatus=9 ExecStart=/usr/bin/taler-exchange-secmod-cs -c /etc/taler/taler.conf StandardOutput=journal StandardError=journal diff --git a/debian/taler-exchange.taler-exchange-secmod-eddsa.service b/debian/taler-exchange.taler-exchange-secmod-eddsa.service index e8fba1736..223eec9e2 100644 --- a/debian/taler-exchange.taler-exchange-secmod-eddsa.service +++ b/debian/taler-exchange.taler-exchange-secmod-eddsa.service @@ -8,6 +8,7 @@ User=taler-exchange-secmod-eddsa Type=simple Restart=always RestartSec=100ms +RestartPreventExitStatus=9 ExecStart=/usr/bin/taler-exchange-secmod-eddsa -c /etc/taler/taler.conf StandardOutput=journal StandardError=journal @@ -16,4 +17,3 @@ PrivateDevices=yes ProtectSystem=full IPAddressDeny=any Slice=taler-exchange.slice - diff --git a/debian/taler-exchange.taler-exchange-secmod-rsa.service b/debian/taler-exchange.taler-exchange-secmod-rsa.service index 10a9585a7..7bfe46006 100644 --- a/debian/taler-exchange.taler-exchange-secmod-rsa.service +++ b/debian/taler-exchange.taler-exchange-secmod-rsa.service @@ -8,6 +8,7 @@ User=taler-exchange-secmod-rsa Type=simple Restart=always RestartSec=100ms +RestartPreventExitStatus=9 ExecStart=/usr/bin/taler-exchange-secmod-rsa -c /etc/taler/taler.conf StandardOutput=journal StandardError=journal diff --git a/debian/taler-exchange.taler-exchange-transfer.service b/debian/taler-exchange.taler-exchange-transfer.service index e26af20d0..40d47b09c 100644 --- a/debian/taler-exchange.taler-exchange-transfer.service +++ b/debian/taler-exchange.taler-exchange-transfer.service @@ -8,6 +8,7 @@ User=taler-exchange-wire Type=simple Restart=always RestartSec=1s +RestartPreventExitStatus=9 ExecStart=/usr/bin/taler-exchange-transfer -c /etc/taler/taler.conf StandardOutput=journal StandardError=journal diff --git a/debian/taler-exchange.taler-exchange-wirewatch.service b/debian/taler-exchange.taler-exchange-wirewatch.service index 7b74737b7..14023c12b 100644 --- a/debian/taler-exchange.taler-exchange-wirewatch.service +++ b/debian/taler-exchange.taler-exchange-wirewatch.service @@ -8,6 +8,7 @@ User=taler-exchange-wire Type=simple Restart=always RestartSec=1s +RestartPreventExitStatus=9 RuntimeMaxSec=3600s ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf StandardOutput=journal diff --git a/debian/taler-exchange.taler-exchange-wirewatch@.service b/debian/taler-exchange.taler-exchange-wirewatch@.service index 85bb9268b..d03d8c70b 100644 --- a/debian/taler-exchange.taler-exchange-wirewatch@.service +++ b/debian/taler-exchange.taler-exchange-wirewatch@.service @@ -8,6 +8,7 @@ User=taler-exchange-wire Type=simple Restart=always RestartSec=1s +RestartPreventExitStatus=9 ExecStart=/usr/bin/taler-exchange-wirewatch -c /etc/taler/taler.conf StandardOutput=journal StandardError=journal -- cgit v1.2.3