diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-05 06:27:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-05 06:27:59 +0000 |
| commit | f36f78c8034efd05eb5f47bdd51ed1375faf70fb (patch) | |
| tree | 5050055c03987c66e98f87dacd1b0f248c62b411 | |
| parent | 775a49120357ff83e3e8d28b21276b36b3cd92ca (diff) | |
| parent | 6fdb73a3b4ad4def8d8c3ca3578c06270f07cb9f (diff) | |
| download | nixpkgs-f36f78c8034efd05eb5f47bdd51ed1375faf70fb.tar nixpkgs-f36f78c8034efd05eb5f47bdd51ed1375faf70fb.tar.gz nixpkgs-f36f78c8034efd05eb5f47bdd51ed1375faf70fb.tar.bz2 nixpkgs-f36f78c8034efd05eb5f47bdd51ed1375faf70fb.tar.lz nixpkgs-f36f78c8034efd05eb5f47bdd51ed1375faf70fb.tar.xz nixpkgs-f36f78c8034efd05eb5f47bdd51ed1375faf70fb.tar.zst nixpkgs-f36f78c8034efd05eb5f47bdd51ed1375faf70fb.zip | |
Merge master into staging-next
| -rw-r--r-- | nixos/modules/services/cluster/k3s/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 5ab0286a38a..300c182406c 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -81,11 +81,14 @@ in # supporting it, or their bundled containerd systemd.enableUnifiedCgroupHierarchy = false; + environment.systemPackages = [ config.services.k3s.package ]; + systemd.services.k3s = { description = "k3s service"; after = [ "network.service" "firewall.service" ] ++ (optional cfg.docker "docker.service"); wants = [ "network.service" "firewall.service" ]; wantedBy = [ "multi-user.target" ]; + path = optional config.boot.zfs.enabled config.boot.zfs.package; serviceConfig = { # See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197 Type = if cfg.role == "agent" then "exec" else "notify"; |