Merge pull request #18152 from roblabla/bugfix-zeroTierOneConfigurablePackage

zerotierone: make package configurable

authored by zimbatm.tngl.sh and committed by

GitHub 17dbfeb4 7b1597be

+12 -4
+12 -4
nixos/modules/services/networking/zerotierone.nix
··· 7 in 8 { 9 options.services.zerotierone.enable = mkEnableOption "ZeroTierOne"; 10 - 11 config = mkIf cfg.enable { 12 systemd.services.zerotierone = { 13 description = "ZeroTierOne"; 14 - path = [ pkgs.zerotierone ]; 15 after = [ "network.target" ]; 16 wantedBy = [ "multi-user.target" ]; 17 preStart = ··· 21 chown -R root:root /var/lib/zerotier-one 22 ''; 23 serviceConfig = { 24 - ExecStart = "${pkgs.zerotierone}/bin/zerotier-one"; 25 Restart = "always"; 26 KillMode = "process"; 27 }; ··· 30 # ZeroTier does not issue DHCP leases, but some strangers might... 31 networking.dhcpcd.denyInterfaces = [ "zt0" ]; 32 33 - environment.systemPackages = [ pkgs.zerotierone ]; 34 }; 35 }
··· 7 in 8 { 9 options.services.zerotierone.enable = mkEnableOption "ZeroTierOne"; 10 + options.services.zerotierone.package = mkOption { 11 + default = pkgs.zerotierone; 12 + defaultText = "pkgs.zerotierone"; 13 + type = types.package; 14 + description = '' 15 + ZeroTier One package to use. 16 + ''; 17 + }; 18 + 19 config = mkIf cfg.enable { 20 systemd.services.zerotierone = { 21 description = "ZeroTierOne"; 22 + path = [ cfg.package ]; 23 after = [ "network.target" ]; 24 wantedBy = [ "multi-user.target" ]; 25 preStart = ··· 29 chown -R root:root /var/lib/zerotier-one 30 ''; 31 serviceConfig = { 32 + ExecStart = "${cfg.package}/bin/zerotier-one"; 33 Restart = "always"; 34 KillMode = "process"; 35 }; ··· 38 # ZeroTier does not issue DHCP leases, but some strangers might... 39 networking.dhcpcd.denyInterfaces = [ "zt0" ]; 40 41 + environment.systemPackages = [ cfg.package ]; 42 }; 43 }