gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sshd: fewer empty lines in generated config (#392527)

Browse Source
This commit is contained in:
Ramses
2025-09-24 06:51:36 +02:00
committed by GitHub
parent 3b754e1040 7ebfdde615
commit 2f5e64c284
2 changed files with 48 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
nixos/modules/programs/ssh.nix
View File

@@ -339,37 +339,37 @@ in
# SSH configuration. Slight duplication of the sshd_config
# generation in the sshd service.
environment.etc."ssh/ssh_config".text = ''
environment.etc."ssh/ssh_config".text = lib.concatStringsSep "\n" (
# Custom options from `extraConfig`, to override generated options
${cfg.extraConfig}
# Generated options from other settings
Host *
${lib.optionalString cfg.systemd-ssh-proxy.enable ''
lib.optional (cfg.extraConfig != "") cfg.extraConfig
++ [
''
# Generated options from other settings
Host *
''
]
++ lib.optional cfg.systemd-ssh-proxy.enable ''
# See systemd-ssh-proxy(1)
Include ${config.systemd.package}/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf
''}
GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}
${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"}
${lib.optionalString cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"}
${lib.optionalString (cfg.forwardX11 != null)
"ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"
}
${lib.optionalString (
''
++ [
"GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}"
]
++ lib.optional (!config.networking.enableIPv6) "AddressFamily inet"
++ lib.optional cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"
++ lib.optional (cfg.forwardX11 != null) "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"
++ lib.optional (
cfg.pubkeyAcceptedKeyTypes != [ ]
) "PubkeyAcceptedKeyTypes ${builtins.concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
${lib.optionalString (
) "PubkeyAcceptedKeyTypes ${builtins.concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"
++ lib.optional (
cfg.hostKeyAlgorithms != [ ]
) "HostKeyAlgorithms ${builtins.concatStringsSep "," cfg.hostKeyAlgorithms}"}
${lib.optionalString (
) "HostKeyAlgorithms ${builtins.concatStringsSep "," cfg.hostKeyAlgorithms}"
++ lib.optional (
cfg.kexAlgorithms != null
) "KexAlgorithms ${builtins.concatStringsSep "," cfg.kexAlgorithms}"}
${lib.optionalString (cfg.ciphers != null) "Ciphers ${builtins.concatStringsSep "," cfg.ciphers}"}
${lib.optionalString (cfg.macs != null) "MACs ${builtins.concatStringsSep "," cfg.macs}"}
'';
) "KexAlgorithms ${builtins.concatStringsSep "," cfg.kexAlgorithms}"
++ lib.optional (cfg.ciphers != null) "Ciphers ${builtins.concatStringsSep "," cfg.ciphers}"
++ lib.optional (cfg.macs != null) "MACs ${builtins.concatStringsSep "," cfg.macs}"
);
environment.etc."ssh/ssh_known_hosts".text = knownHostsText;