summary refs log tree commit diff
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2016-12-29 09:49:19 -0500
committerGraham Christensen <graham@grahamc.com>2016-12-29 17:04:46 -0500
commit8ed4c8b73bee52f04499500020d4a0a750501789 (patch)
tree3509ac97faafcd5e795c0d79caa9eca315f6291c
parent11e8ed5ff4bf9930b321186c3e606b3320784a38 (diff)
downloadnixlib-8ed4c8b73bee52f04499500020d4a0a750501789.tar
nixlib-8ed4c8b73bee52f04499500020d4a0a750501789.tar.gz
nixlib-8ed4c8b73bee52f04499500020d4a0a750501789.tar.bz2
nixlib-8ed4c8b73bee52f04499500020d4a0a750501789.tar.lz
nixlib-8ed4c8b73bee52f04499500020d4a0a750501789.tar.xz
nixlib-8ed4c8b73bee52f04499500020d4a0a750501789.tar.zst
nixlib-8ed4c8b73bee52f04499500020d4a0a750501789.zip
openssh: 7.4p1 no longer backgrounds when systemd is starting it.
-rw-r--r--nixos/modules/services/networking/ssh/sshd.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 073391ffdbbc..80659f19c597 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -264,8 +264,7 @@ in
                 StandardInput = "socket";
               } else {
                 Restart = "always";
-                Type = "forking";
-                PIDFile = "/run/sshd.pid";
+                Type = "simple";
               });
           };
 
@@ -322,8 +321,6 @@ in
 
     services.openssh.extraConfig = mkOrder 0
       ''
-        PidFile /run/sshd.pid
-
         Protocol 2
 
         UsePAM yes