diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2018-08-08 17:02:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 17:02:25 +0200 |
commit | 565479374b6d06725f4ac69cda868e93c9678b9a (patch) | |
tree | a528050a5cd162a10c8a2a7039ea7c0ad507aa5c | |
parent | bf1b50cbc8ffe9747758d089e3148406a7ce5c21 (diff) | |
parent | 5b66ddb94333fe6f67bd33e0150045e547416ac7 (diff) | |
download | nixpkgs-565479374b6d06725f4ac69cda868e93c9678b9a.tar nixpkgs-565479374b6d06725f4ac69cda868e93c9678b9a.tar.gz nixpkgs-565479374b6d06725f4ac69cda868e93c9678b9a.tar.bz2 nixpkgs-565479374b6d06725f4ac69cda868e93c9678b9a.tar.lz nixpkgs-565479374b6d06725f4ac69cda868e93c9678b9a.tar.xz nixpkgs-565479374b6d06725f4ac69cda868e93c9678b9a.tar.zst nixpkgs-565479374b6d06725f4ac69cda868e93c9678b9a.zip |
Merge pull request #42469 from ghuntley/patch-4
zerotier: added option to customise the port used
-rw-r--r-- | nixos/modules/services/networking/zerotierone.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index 4c1ee75d536..a4cd368397e 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -17,6 +17,15 @@ in ''; }; + options.services.zerotierone.port = mkOption { + default = 9993; + example = 9993; + type = types.int; + description = '' + Network port used by ZeroTier. + ''; + }; + options.services.zerotierone.package = mkOption { default = pkgs.zerotierone; defaultText = "pkgs.zerotierone"; @@ -40,7 +49,7 @@ in touch "/var/lib/zerotier-one/networks.d/${netId}.conf" '') cfg.joinNetworks); serviceConfig = { - ExecStart = "${cfg.package}/bin/zerotier-one"; + ExecStart = "${cfg.package}/bin/zerotier-one -p${toString cfg.port}"; Restart = "always"; KillMode = "process"; }; @@ -49,8 +58,8 @@ in # ZeroTier does not issue DHCP leases, but some strangers might... networking.dhcpcd.denyInterfaces = [ "zt*" ]; - # ZeroTier receives UDP transmissions on port 9993 by default - networking.firewall.allowedUDPPorts = [ 9993 ]; + # ZeroTier receives UDP transmissions + networking.firewall.allowedUDPPorts = [ cfg.port ]; environment.systemPackages = [ cfg.package ]; }; |