diff options
| author | Martin Puppe <dev@mpuppe.de> | 2023-01-31 09:58:50 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-03-22 19:18:59 +0000 |
| commit | 65f3a6c743ff2ae7409833953b424550372a7026 (patch) | |
| tree | 2e953e26f244594f543e1c043e2785e07963f458 | |
| parent | nixos/yggdrasil: support HJSON files as configFile (diff) | |
| download | nixpkgs-origin/backport-217366-to-release-22.11.tar.gz | |
nixos/yggdrasil: correct documentationorigin/backport-217366-to-release-22.11
The option `LinkLocalTCPPort` does not exist anymore in recent versions
of Yggdrasil. The port for incoming link-local connections is now
configured as part of the `MulticastInterfaces` option. Our
documentation should reflect that.
(cherry picked from commit 8bc615d0e089f302f787a115f907105a367f0300)
| -rw-r--r-- | nixos/modules/services/networking/yggdrasil.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index c5ef4d9bad61..31378914a064 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -46,7 +46,7 @@ in If no keys are specified then ephemeral keys are generated and the Yggdrasil interface will have a random IPv6 address - each time the service is started, this is the default. + each time the service is started. This is the default. If both {option}`configFile` and {option}`settings` are supplied, they will be combined, with values from @@ -83,14 +83,14 @@ in type = bool; default = false; description = lib.mdDoc '' - Whether to open the UDP port used for multicast peer - discovery. The NixOS firewall blocks link-local - communication, so in order to make local peering work you - will also need to set `LinkLocalTCPPort` in your - yggdrasil configuration ({option}`settings` or - {option}`configFile`) to a port number other than 0, - and then add that port to - {option}`networking.firewall.allowedTCPPorts`. + Whether to open the UDP port used for multicast peer discovery. The + NixOS firewall blocks link-local communication, so in order to make + incoming local peering work you will also need to configure + `MulticastInterfaces` in your Yggdrasil configuration + ({option}`settings` or {option}`configFile`). You will then have to + add the ports that you configure there to your firewall configuration + ({option}`networking.firewall.allowedTCPPorts` or + {option}`networking.firewall.interfaces.<name>.allowedTCPPorts`). ''; }; |