Unverified Commit 266315c9 authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #53767 from kwohlfahrt/ssh 

ssh: put custom options before generated options
parents 358efb66 de7abf63

nixos/modules/programs/ssh.nix

+7 −3
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ in 
        type = types.lines;

        default = "";

        description = ''

          Extra configuration text appended to <filename>ssh_config</filename>.

          Extra configuration text prepended to <filename>ssh_config</filename>. Other generated

          options will be added after a <code>Host *</code> pattern.

          See <citerefentry><refentrytitle>ssh_config</refentrytitle><manvolnum>5</manvolnum></citerefentry>

          for help.

        '';
@@ -203,6 +204,11 @@ in 
    # generation in the sshd service.

    environment.etc."ssh/ssh_config".text =

      ''

        # Custom options from `extraConfig`, to override generated options

        ${cfg.extraConfig}



        # Generated options from other settings

        Host *

        AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}



        ${optionalString cfg.setXAuthLocation ''
@@ -213,8 +219,6 @@ in 


        ${optionalString (cfg.pubkeyAcceptedKeyTypes != []) "PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}

        ${optionalString (cfg.hostKeyAlgorithms != []) "HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}"}



        ${cfg.extraConfig}

      '';



    environment.etc."ssh/ssh_known_hosts".text = knownHostsText;