lol

nixos/openssh: Drop deprecated locations

The changelog entry should give a good indication why I don't think this
is necessary anymore.

+8 -5
+4
nixos/doc/manual/release-notes/rl-2305.section.md
··· 123 123 124 124 - The `ssh` client tool now disables the `~C` escape sequence by default. This can be re-enabled by setting `EnableEscapeCommandline yes` 125 125 126 + - The `ssh` module does not read `/etc/ssh/ssh_known_hosts2` anymore since this location is [deprecated since 2001](https://marc.info/?l=openssh-unix-dev&m=100508718416162&w=2). 127 + 128 + - The openssh module does not read `~/.ssh/authorized_keys2` anymore since this location is [deprecated since 2001](https://marc.info/?l=openssh-unix-dev&m=100508718416162&w=2). 129 + 126 130 - `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems. 127 131 128 132 - `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories.
+3 -4
nixos/modules/programs/ssh.nix
··· 26 26 + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile) 27 27 )) + "\n"; 28 28 29 - knownHostsFiles = [ "/etc/ssh/ssh_known_hosts" "/etc/ssh/ssh_known_hosts2" ] 29 + knownHostsFiles = [ "/etc/ssh/ssh_known_hosts" ] 30 30 ++ map pkgs.copyPathToStore cfg.knownHostsFiles; 31 31 32 32 in ··· 232 232 description = lib.mdDoc '' 233 233 Files containing SSH host keys to set as global known hosts. 234 234 `/etc/ssh/ssh_known_hosts` (which is 235 - generated by {option}`programs.ssh.knownHosts`) and 236 - `/etc/ssh/ssh_known_hosts2` are always 237 - included. 235 + generated by {option}`programs.ssh.knownHosts`) is 236 + always included. 238 237 ''; 239 238 example = literalExpression '' 240 239 [
+1 -1
nixos/modules/services/networking/ssh/sshd.nix
··· 536 536 # https://github.com/NixOS/nixpkgs/pull/10155 537 537 # https://github.com/NixOS/nixpkgs/pull/41745 538 538 services.openssh.authorizedKeysFiles = 539 - [ "%h/.ssh/authorized_keys" "%h/.ssh/authorized_keys2" "/etc/ssh/authorized_keys.d/%u" ]; 539 + [ "%h/.ssh/authorized_keys" "/etc/ssh/authorized_keys.d/%u" ]; 540 540 541 541 services.openssh.extraConfig = mkOrder 0 542 542 ''