Skip to content

Commit d2cce43

Browse files
authored
Merge: nixos/ssh: add the systemd-ssh-proxy include directive to the Host * block (#405967)
2 parents acd6544 + 57d91c5 commit d2cce43

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

nixos/modules/programs/ssh.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,13 +341,13 @@ in
341341
# Custom options from `extraConfig`, to override generated options
342342
${cfg.extraConfig}
343343
344+
# Generated options from other settings
345+
Host *
344346
${lib.optionalString cfg.systemd-ssh-proxy.enable ''
345347
# See systemd-ssh-proxy(1)
346348
Include ${config.systemd.package}/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf
347349
''}
348350
349-
# Generated options from other settings
350-
Host *
351351
GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}
352352
353353
${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"}

0 commit comments

Comments
 (0)