Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 79e6d13a4ada
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fcf547d0e23b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 23, 2020

  1. The systemd unit for k3s should differ between agents and servers

    @johnae
    johnae committed Apr 23, 2020
    Copy the full SHA
    41a95b1 View commit details

Commits on Apr 25, 2020

  1. Merge pull request #85813 from johnae/fix-k3s-systemd-units 

    The systemd unit for k3s should differ between agents and servers
    @nlewo
    nlewo authored Apr 25, 2020
    Copy the full SHA
    fcf547d View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/services/cluster/k3s/default.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/cluster/k3s/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";