Unverified Commit 532db1f9 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #310621 from Istvan91/dont_write_defaults_in_ssh_config 

nixos/ssh: don't write addressfamily with default value in config
parents a0691657 92a6247b

nixos/modules/programs/ssh.nix

+1 −1
Original line number Diff line number Diff line
@@ -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"}"}