diff options
| author | Peter Hoeg <peter@speartail.com> | 2016-06-19 17:19:31 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@speartail.com> | 2016-08-04 16:47:44 +0800 |
| commit | c4cba0e51f9db45b3faee55e8a5ed6d63c227f92 (patch) | |
| tree | 4cee189e283453b0a0b3ecac734852e02a0ed473 /nixos | |
| parent | c5d9dc9cfae33d41b732d8a853e8ef524b9c0d23 (diff) | |
| download | nixlib-c4cba0e51f9db45b3faee55e8a5ed6d63c227f92.tar nixlib-c4cba0e51f9db45b3faee55e8a5ed6d63c227f92.tar.gz nixlib-c4cba0e51f9db45b3faee55e8a5ed6d63c227f92.tar.bz2 nixlib-c4cba0e51f9db45b3faee55e8a5ed6d63c227f92.tar.lz nixlib-c4cba0e51f9db45b3faee55e8a5ed6d63c227f92.tar.xz nixlib-c4cba0e51f9db45b3faee55e8a5ed6d63c227f92.tar.zst nixlib-c4cba0e51f9db45b3faee55e8a5ed6d63c227f92.zip | |
ssh module: ignore exit code when socket activated
sshd will at times fail when exiting. When socket activated, this will leave a number of sshd@ service instances in the failed state, so we simply ignore the error code if we are running socket activated. Recommended by upstream: http://systemd-devel.freedesktop.narkive.com/d0eapMCG/socket-activated-sshd-service-showing-up-as-a-failure-when-the-client-connection-fails Fixes: #3279
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/ssh/sshd.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index a464733a6a03..f900ef494abf 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -263,6 +263,7 @@ in serviceConfig = { ExecStart = + (optionalString cfg.startWhenNeeded "-") + "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") + "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}"; KillMode = "process"; |