nixos/sshd: Fix socket activated SSH connections entering failed state.

In afeb76d6287955bc8c638365ebefe71a1fd7302a, sshd.service and
sshd@.service were switched to Type=notify. This apparently works for
sshd.service, but not for sshd@.service. Given that the reason for
this working with sshd.service isn't exactly clear, let's revert it
for both of them for now, and revisit Type=notify later.

Changed files
+3 -2
nixos
modules
services
networking
ssh
tests
-2
nixos/modules/services/networking/ssh/sshd.nix
···
environment.LD_LIBRARY_PATH = nssModulesPath;
serviceConfig = {
-
Type = "notify";
ExecStart = lib.concatStringsSep " " [
"-${lib.getExe' cfg.package "sshd"}"
"-i"
···
restartTriggers = [ config.environment.etc."ssh/sshd_config".source ];
serviceConfig = {
-
Type = "notify";
Restart = "always";
ExecStart = lib.concatStringsSep " " [
(lib.getExe' cfg.package "sshd")
+3
nixos/tests/openssh.nix
···
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-no-pam true",
timeout=30
)
+
+
# None of the per-connection units should have failed.
+
server_lazy.fail("systemctl is-failed 'sshd@*.service'")
'';
})