Unverified Commit d2cce43a authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: nixos/ssh: add the systemd-ssh-proxy include directive to the Host * block (#405967)

parents acd65443 57d91c53

nixos/modules/programs/ssh.nix

+2 −2
Original line number Diff line number Diff line
@@ -341,13 +341,13 @@ in 
      # Custom options from `extraConfig`, to override generated options

      ${cfg.extraConfig}



      # Generated options from other settings

      Host *

      ${lib.optionalString cfg.systemd-ssh-proxy.enable ''

        # See systemd-ssh-proxy(1)

        Include ${config.systemd.package}/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf

      ''}



      # Generated options from other settings

      Host *

      GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}



      ${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"}