summary refs log tree commit diff
path: root/nixos/modules/services/networking
diff options
context:
space:
mode:
authorIzorkin <Izorkin@gmail.com>2018-06-10 02:39:06 +0300
committerxeji <36407913+xeji@users.noreply.github.com>2018-06-10 01:39:06 +0200
commit9ef30fd56a02872a6b33cb8c29d0f476ef0dbd05 (patch)
tree3e90a142d72f40106dd97dd911b764c576337f09 /nixos/modules/services/networking
parent91be6b9f402a5c05d1173f7f77376d04ca2f97e5 (diff)
downloadnixlib-9ef30fd56a02872a6b33cb8c29d0f476ef0dbd05.tar
nixlib-9ef30fd56a02872a6b33cb8c29d0f476ef0dbd05.tar.gz
nixlib-9ef30fd56a02872a6b33cb8c29d0f476ef0dbd05.tar.bz2
nixlib-9ef30fd56a02872a6b33cb8c29d0f476ef0dbd05.tar.lz
nixlib-9ef30fd56a02872a6b33cb8c29d0f476ef0dbd05.tar.xz
nixlib-9ef30fd56a02872a6b33cb8c29d0f476ef0dbd05.tar.zst
nixlib-9ef30fd56a02872a6b33cb8c29d0f476ef0dbd05.zip
sshd: change location of config file (#41744)
create symlink /etc/ssh/sshd_config
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r--nixos/modules/services/networking/ssh/sshd.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 902e759f3a3a..961e72b2b810 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -334,7 +334,9 @@ in
     services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli";
 
     environment.etc = authKeysFiles //
-      { "ssh/moduli".source = cfg.moduliFile; };
+      { "ssh/moduli".source = cfg.moduliFile;
+        "ssh/sshd_config".text = cfg.extraConfig;
+      };
 
     systemd =
       let
@@ -365,7 +367,7 @@ in
               { ExecStart =
                   (optionalString cfg.startWhenNeeded "-") +
                   "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") +
-                  "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
+                  "-f /etc/ssh/sshd_config";
                 KillMode = "process";
               } // (if cfg.startWhenNeeded then {
                 StandardInput = "socket";