Merge pull request #310621 from Istvan91/dont_write_defaults_in_ssh_config

nixos/ssh: don't write addressfamily with default value in config
This commit is contained in:
Aleksana
2024-07-19 21:23:08 +08:00
committed by GitHub
+1 -1
View File
@@ -293,9 +293,9 @@ in
# Generated options from other settings
Host *
AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
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"}"}