about summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorJohn Axel Eriksson <john@insane.se>2020-04-22 23:00:14 +0200
committerJohn Axel Eriksson <john@insane.se>2020-04-23 07:55:23 +0200
commit41a95b1b7d88f45fb536640d8d8d482d89e8bce1 (patch)
tree37483f7aa22e45e8a124db46819e8de3a6616791 /nixos/modules/services
parentaf3e5fc48a266c8d765e101e2ee9d8aed93bfb3e (diff)
downloadnixlib-41a95b1b7d88f45fb536640d8d8d482d89e8bce1.tar
nixlib-41a95b1b7d88f45fb536640d8d8d482d89e8bce1.tar.gz
nixlib-41a95b1b7d88f45fb536640d8d8d482d89e8bce1.tar.bz2
nixlib-41a95b1b7d88f45fb536640d8d8d482d89e8bce1.tar.lz
nixlib-41a95b1b7d88f45fb536640d8d8d482d89e8bce1.tar.xz
nixlib-41a95b1b7d88f45fb536640d8d8d482d89e8bce1.tar.zst
nixlib-41a95b1b7d88f45fb536640d8d8d482d89e8bce1.zip
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.nix4
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";