diff --git a/nix/host-modules/swarm-bao.nix b/nix/host-modules/swarm-bao.nix index 0cd4145d..9ea83ad8 100644 --- a/nix/host-modules/swarm-bao.nix +++ b/nix/host-modules/swarm-bao.nix @@ -1125,6 +1125,7 @@ let RemainAfterExit = true; Restart = "on-failure"; RestartSec = 30; + TimeoutStartSec = 60; }; script = '' set -euo pipefail @@ -2935,6 +2936,7 @@ in RemainAfterExit = true; Restart = "on-failure"; RestartSec = 30; + TimeoutStartSec = 60; # Runs only once the script above exits 0, which is when the # granter may first configure `auth/oidc`; the viewer unit exits 0 # without doing so before then, and nothing else re-runs it. A @@ -3055,6 +3057,9 @@ in RemainAfterExit = true; Restart = "on-failure"; RestartSec = 30; + # Above the granting units' 60s: an attempt may generate the + # services root, a 4096-bit RSA key. + TimeoutStartSec = "2min"; }; script = '' set -euo pipefail @@ -3462,6 +3467,10 @@ in RemainAfterExit = true; Restart = "on-failure"; RestartSec = 30; + # An attempt may generate a 4096-bit RSA root and then wait on a + # blocking restart of openbao: its stop and its start, 90s each by + # systemd's defaults. + TimeoutStartSec = "5min"; }; script = '' set -euo pipefail diff --git a/nix/host-modules/swarm-nats.nix b/nix/host-modules/swarm-nats.nix index 24653594..34fbaec5 100644 --- a/nix/host-modules/swarm-nats.nix +++ b/nix/host-modules/swarm-nats.nix @@ -1043,6 +1043,10 @@ in SyslogIdentifier = "swarm-bao-nats-tls"; Restart = "on-failure"; RestartSec = 30; + # An attempt that rotates the leaf waits on a blocking restart of the + # server in its container: up to 150s to stop (nixpkgs' nats module) + # and 90s to start. + TimeoutStartSec = "5min"; }; environment = { BAO_ADDR = "https://${baoCfg.domain}:${toString baoCfg.port}"; diff --git a/nix/module-eval/bao-grants.nix b/nix/module-eval/bao-grants.nix index 592802b3..47bb5e67 100644 --- a/nix/module-eval/bao-grants.nix +++ b/nix/module-eval/bao-grants.nix @@ -1058,6 +1058,21 @@ let && u.serviceConfig.Restart == "on-failure" ) grantingUnitNames; } + { + # A oneshot has no start timeout by default, so an attempt that never + # ends never fails into a retry. + name = "the granter's role and every granting unit bound their attempt"; + ok = lib.all ( + unit: + !(lib.elem + (toString (baoGrantHere.systemd.services.${unit}.serviceConfig.TimeoutStartSec or "infinity")) + [ + "infinity" + "0" + ] + ) + ) ([ "swarm-bao-granter-role" ] ++ grantingUnitNames); + } { # A fetch from the store outlives a store or gateway that is down or # sealed for hours: `start-limit-hit` does not clear when the store comes diff --git a/nix/module-eval/nats-tls.nix b/nix/module-eval/nats-tls.nix index b64d3695..ee921ec7 100644 --- a/nix/module-eval/nats-tls.nix +++ b/nix/module-eval/nats-tls.nix @@ -297,6 +297,16 @@ let !(lib.elem "swarm-bao-nats-tls-policy.service" u.after) && !(lib.elem "swarm-bao-nats-tls-policy.service" u.wants); } + { + # A oneshot has no start timeout by default, so an attempt that never + # ends never fails into a retry, and the daily timer's start is a no-op. + name = "the leaf unit bounds its attempt"; + ok = + !(lib.elem (toString (leafUnit.serviceConfig.TimeoutStartSec or "infinity")) [ + "infinity" + "0" + ]); + } { # Every hive dials the queue by the same name, so a hive away from it # needs no URL of its own. Control and property in one: the scan must