nixos/yggdrasil: services.yggdrasil.config renamed to settings

Changed files
+6 -6
nixos
modules
services
+4 -4
nixos/modules/services/networking/yggdrasil.nix
···
If the {option}`persistentKeys` is enabled then the
keys that are generated during activation will override
-
those in {option}`config` or
{option}`configFile`.
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.
-
If both {option}`configFile` and {option}`config`
are supplied, they will be combined, with values from
{option}`configFile` taking precedence.
···
example = "/run/keys/yggdrasil.conf";
description = lib.mdDoc ''
A file which contains JSON configuration for yggdrasil.
-
See the {option}`config` option for more information.
'';
};
···
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}`config` or
{option}`configFile`) to a port number other than 0,
and then add that port to
{option}`networking.firewall.allowedTCPPorts`.
···
If the {option}`persistentKeys` is enabled then the
keys that are generated during activation will override
+
those in {option}`settings` or
{option}`configFile`.
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.
+
If both {option}`configFile` and {option}`settings`
are supplied, they will be combined, with values from
{option}`configFile` taking precedence.
···
example = "/run/keys/yggdrasil.conf";
description = lib.mdDoc ''
A file which contains JSON configuration for yggdrasil.
+
See the {option}`settings` option for more information.
'';
};
···
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`.
+2 -2
nixos/modules/services/networking/yggdrasil.xml
···
# The NixOS module will generate new keys and a new IPv6 address each time
# it is started if persistentKeys is not enabled.
-
config = {
Peers = [
# Yggdrasil will automatically connect and "peer" with other nodes it
# discovers via link-local multicast annoucements. Unless this is the
···
services.yggdrasil = {
enable = true;
persistentKeys = true; # Maintain a fixed public key and IPv6 address.
-
config = {
Peers = [ "tcp://1.2.3.4:1024" "tcp://1.2.3.5:1024" ];
NodeInfo = {
# This information is visible to the network.
···
# The NixOS module will generate new keys and a new IPv6 address each time
# it is started if persistentKeys is not enabled.
+
settings = {
Peers = [
# Yggdrasil will automatically connect and "peer" with other nodes it
# discovers via link-local multicast annoucements. Unless this is the
···
services.yggdrasil = {
enable = true;
persistentKeys = true; # Maintain a fixed public key and IPv6 address.
+
settings = {
Peers = [ "tcp://1.2.3.4:1024" "tcp://1.2.3.5:1024" ];
NodeInfo = {
# This information is visible to the network.