diff options
| author | lewo <lewo@abesis.fr> | 2020-04-25 09:45:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-25 09:45:49 +0200 |
| commit | fcf547d0e23b4be19fdd877a1e31dff0d0b0498d (patch) | |
| tree | 1e53f9d7d45f57a2e85178de8256fde5fbfa829a /nixos/modules/services | |
| parent | 79e6d13a4adae7e82595b89e5149b002ab2bf16e (diff) | |
| parent | 41a95b1b7d88f45fb536640d8d8d482d89e8bce1 (diff) | |
| download | nixlib-fcf547d0e23b4be19fdd877a1e31dff0d0b0498d.tar nixlib-fcf547d0e23b4be19fdd877a1e31dff0d0b0498d.tar.gz nixlib-fcf547d0e23b4be19fdd877a1e31dff0d0b0498d.tar.bz2 nixlib-fcf547d0e23b4be19fdd877a1e31dff0d0b0498d.tar.lz nixlib-fcf547d0e23b4be19fdd877a1e31dff0d0b0498d.tar.xz nixlib-fcf547d0e23b4be19fdd877a1e31dff0d0b0498d.tar.zst nixlib-fcf547d0e23b4be19fdd877a1e31dff0d0b0498d.zip | |
Merge pull request #85813 from johnae/fix-k3s-systemd-units
The systemd unit for k3s should differ between agents and servers
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/cluster/k3s/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index ccdf54d128e2..2e8bf20a68fc 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -81,8 +81,8 @@ in after = mkIf cfg.docker [ "docker.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - # Taken from https://github.com/rancher/k3s/blob/v1.17.4+k3s1/contrib/ansible/roles/k3s/node/templates/k3s.service.j2 - Type = "notify"; + # See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197 + Type = if cfg.role == "agent" then "exec" else "notify"; KillMode = "process"; Delegate = "yes"; Restart = "always"; |