pyrox.dev
Merge staging-next into staging
authored by github-actions[bot] and committed by GitHub d776739d 8d96bfd4
+3
nixos/modules/services/cluster/k3s/default.nix
+3
nixos/modules/services/cluster/k3s/default.nix
···
81
81
# supporting it, or their bundled containerd
82
82
systemd.enableUnifiedCgroupHierarchy = false;
83
83
84
+
environment.systemPackages = [ config.services.k3s.package ];
85
+
84
86
systemd.services.k3s = {
85
87
description = "k3s service";
86
88
after = [ "network.service" "firewall.service" ] ++ (optional cfg.docker "docker.service");
87
89
wants = [ "network.service" "firewall.service" ];
88
90
wantedBy = [ "multi-user.target" ];
91
+
path = optional config.boot.zfs.enabled config.boot.zfs.package;
89
92
serviceConfig = {
90
93
# See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197
91
94
Type = if cfg.role == "agent" then "exec" else "notify";