Merge pull request #18152 from roblabla/bugfix-zeroTierOneConfigurablePackage

zerotierone: make package configurable

zimbatm 17dbfeb4 7b1597be

Changed files
+12 -4
nixos
modules
services
networking
+12 -4
nixos/modules/services/networking/zerotierone.nix
···
in
{
options.services.zerotierone.enable = mkEnableOption "ZeroTierOne";
-
config = mkIf cfg.enable {
systemd.services.zerotierone = {
description = "ZeroTierOne";
-
path = [ pkgs.zerotierone ];
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart =
···
chown -R root:root /var/lib/zerotier-one
'';
serviceConfig = {
-
ExecStart = "${pkgs.zerotierone}/bin/zerotier-one";
Restart = "always";
KillMode = "process";
};
···
# ZeroTier does not issue DHCP leases, but some strangers might...
networking.dhcpcd.denyInterfaces = [ "zt0" ];
-
environment.systemPackages = [ pkgs.zerotierone ];
};
}
···
in
{
options.services.zerotierone.enable = mkEnableOption "ZeroTierOne";
+
options.services.zerotierone.package = mkOption {
+
default = pkgs.zerotierone;
+
defaultText = "pkgs.zerotierone";
+
type = types.package;
+
description = ''
+
ZeroTier One package to use.
+
'';
+
};
+
config = mkIf cfg.enable {
systemd.services.zerotierone = {
description = "ZeroTierOne";
+
path = [ cfg.package ];
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart =
···
chown -R root:root /var/lib/zerotier-one
'';
serviceConfig = {
+
ExecStart = "${cfg.package}/bin/zerotier-one";
Restart = "always";
KillMode = "process";
};
···
# ZeroTier does not issue DHCP leases, but some strangers might...
networking.dhcpcd.denyInterfaces = [ "zt0" ];
+
environment.systemPackages = [ cfg.package ];
};
}