public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25818 from jammerful/ssh

Browse Source 
ssh: Add Newline to KnownHostsText
This commit is contained in:
James Cook 2017-05-16 05:25:43 +00:00 committed by GitHub
commit 2e966dc167
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/programs/ssh.nix
View File

@ -20,11 +20,11 @@ let
knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts); knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
knownHostsText = flip (concatMapStringsSep "\n") knownHosts knownHostsText = (flip (concatMapStringsSep "\n") knownHosts
(h: assert h.hostNames != []; (h: assert h.hostNames != [];
concatStringsSep "," h.hostNames + " " concatStringsSep "," h.hostNames + " "
+ (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile) + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
); )) + "\n";
in in
{ {