mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-13 05:05:29 +03:00
nixos/openssh: Drop deprecated locations
The changelog entry should give a good indication why I don't think this is necessary anymore.
This commit is contained in:
parent
490601e157
commit
98c3d190b2
3 changed files with 8 additions and 5 deletions
|
@ -26,7 +26,7 @@ let
|
|||
+ (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
|
||||
)) + "\n";
|
||||
|
||||
knownHostsFiles = [ "/etc/ssh/ssh_known_hosts" "/etc/ssh/ssh_known_hosts2" ]
|
||||
knownHostsFiles = [ "/etc/ssh/ssh_known_hosts" ]
|
||||
++ map pkgs.copyPathToStore cfg.knownHostsFiles;
|
||||
|
||||
in
|
||||
|
@ -232,9 +232,8 @@ in
|
|||
description = lib.mdDoc ''
|
||||
Files containing SSH host keys to set as global known hosts.
|
||||
`/etc/ssh/ssh_known_hosts` (which is
|
||||
generated by {option}`programs.ssh.knownHosts`) and
|
||||
`/etc/ssh/ssh_known_hosts2` are always
|
||||
included.
|
||||
generated by {option}`programs.ssh.knownHosts`) is
|
||||
always included.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
[
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue