diff options
author | Emery Hemingway <ehmry@posteo.net> | 2022-09-24 12:34:59 -0500 |
---|---|---|
committer | ehmry <ehmry@posteo.net> | 2022-09-25 11:10:32 -0500 |
commit | dbf8bba95bea7255565d6f4862ac515944f45254 (patch) | |
tree | 2f59a72190b062bcfd8e356fcaa8e60ec0686aa3 | |
parent | e85617ef8411ba1705b2991759dd4a0d0167c1d9 (diff) | |
download | nixpkgs-dbf8bba95bea7255565d6f4862ac515944f45254.tar nixpkgs-dbf8bba95bea7255565d6f4862ac515944f45254.tar.gz nixpkgs-dbf8bba95bea7255565d6f4862ac515944f45254.tar.bz2 nixpkgs-dbf8bba95bea7255565d6f4862ac515944f45254.tar.lz nixpkgs-dbf8bba95bea7255565d6f4862ac515944f45254.tar.xz nixpkgs-dbf8bba95bea7255565d6f4862ac515944f45254.tar.zst nixpkgs-dbf8bba95bea7255565d6f4862ac515944f45254.zip |
nixos/yggdrasil: services.yggdrasil.config renamed to settings
-rw-r--r-- | nixos/modules/services/networking/yggdrasil.nix | 8 | ||||
-rw-r--r-- | nixos/modules/services/networking/yggdrasil.xml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 620ace2d8c8..e56f169d05e 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -40,14 +40,14 @@ in { If the {option}`persistentKeys` is enabled then the keys that are generated during activation will override - those in {option}`config` or + 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}`config` + If both {option}`configFile` and {option}`settings` are supplied, they will be combined, with values from {option}`configFile` taking precedence. @@ -62,7 +62,7 @@ in { example = "/run/keys/yggdrasil.conf"; description = lib.mdDoc '' A file which contains JSON configuration for yggdrasil. - See the {option}`config` option for more information. + See the {option}`settings` option for more information. ''; }; @@ -81,7 +81,7 @@ in { 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 + yggdrasil configuration ({option}`settings` or {option}`configFile`) to a port number other than 0, and then add that port to {option}`networking.firewall.allowedTCPPorts`. diff --git a/nixos/modules/services/networking/yggdrasil.xml b/nixos/modules/services/networking/yggdrasil.xml index a341d5d8153..bc9da84fa43 100644 --- a/nixos/modules/services/networking/yggdrasil.xml +++ b/nixos/modules/services/networking/yggdrasil.xml @@ -27,7 +27,7 @@ An annotated example of a simple configuration: # The NixOS module will generate new keys and a new IPv6 address each time # it is started if persistentKeys is not enabled. - config = { + settings = { Peers = [ # Yggdrasil will automatically connect and "peer" with other nodes it # discovers via link-local multicast annoucements. Unless this is the @@ -58,7 +58,7 @@ in { services.yggdrasil = { enable = true; persistentKeys = true; # Maintain a fixed public key and IPv6 address. - config = { + settings = { Peers = [ "tcp://1.2.3.4:1024" "tcp://1.2.3.5:1024" ]; NodeInfo = { # This information is visible to the network. |