diff options
| author | Janne Heß <janne@hess.ooo> | 2023-04-13 13:56:08 +0200 |
|---|---|---|
| committer | Janne Heß <janne@hess.ooo> | 2023-04-13 20:31:18 +0200 |
| commit | 98c3d190b2bc732a211fb417a73b3cad7a33c83a (patch) | |
| tree | a55ba15c192f9e27806330bad4c7354cf3638dcf /nixos/modules/programs | |
| parent | 490601e157c0ba2ffb219a75f4977644a8581b4e (diff) | |
| download | nixpkgs-98c3d190b2bc732a211fb417a73b3cad7a33c83a.tar nixpkgs-98c3d190b2bc732a211fb417a73b3cad7a33c83a.tar.gz nixpkgs-98c3d190b2bc732a211fb417a73b3cad7a33c83a.tar.bz2 nixpkgs-98c3d190b2bc732a211fb417a73b3cad7a33c83a.tar.lz nixpkgs-98c3d190b2bc732a211fb417a73b3cad7a33c83a.tar.xz nixpkgs-98c3d190b2bc732a211fb417a73b3cad7a33c83a.tar.zst nixpkgs-98c3d190b2bc732a211fb417a73b3cad7a33c83a.zip | |
nixos/openssh: Drop deprecated locations
The changelog entry should give a good indication why I don't think this is necessary anymore.
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/ssh.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 1ec698820a8..7c85d1e7c3d 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -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 '' [ |