From 4f11c06fac92bc19b764a9248df416f20ff5ad03 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 18 Jan 2019 15:31:19 +0100 Subject: [PATCH] programs.ssh.knownHosts: update example to be an attrset We shouldn't encourage using a list here, but prefer the attrset. Using a list here causes very unintuitive effects during merging. --- nixos/modules/programs/ssh.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index cc398174e6ce..4640c1d78d20 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -167,16 +167,16 @@ in The set of system-wide known SSH hosts. ''; example = literalExample '' - [ - { + { + myhost = { hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub; - } - { + }; + myhost2 = { hostNames = [ "myhost2" ]; publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub; - } - ] + }; + } ''; };