diff options
author | Colin Watson <cjwatson@debian.org> | 2020-02-21 14:45:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-02-21 14:48:42 +0000 |
commit | cb37f2bf1b8576863448555af5c5309a6c220785 (patch) | |
tree | 3a73125336f610265c6793cba89942eada865a2e /ssh_config.5 | |
parent | 886e47e745586c34e81cfd5c5fb9b5dbc8e84d04 (diff) | |
parent | 86fe78ef4686485394b464cf9d3393ce27b33979 (diff) |
Include /etc/ssh/*_config.d/*.conf
Include /etc/ssh/ssh_config.d/*.conf from /etc/ssh/ssh_config and
/etc/ssh/sshd_config.d/*.conf from /etc/ssh/sshd_config.
Closes: #845315
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 6b4e4f43b..91beb6f50 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -80,6 +80,8 @@ which are not the default in | |||
80 | .Pp | 80 | .Pp |
81 | .Bl -bullet -offset indent -compact | 81 | .Bl -bullet -offset indent -compact |
82 | .It | 82 | .It |
83 | .Cm Include /etc/ssh/ssh_config.d/*.conf | ||
84 | .It | ||
83 | .Cm SendEnv No LANG LC_* | 85 | .Cm SendEnv No LANG LC_* |
84 | .It | 86 | .It |
85 | .Cm HashKnownHosts No yes | 87 | .Cm HashKnownHosts No yes |
@@ -87,6 +89,11 @@ which are not the default in | |||
87 | .Cm GSSAPIAuthentication No yes | 89 | .Cm GSSAPIAuthentication No yes |
88 | .El | 90 | .El |
89 | .Pp | 91 | .Pp |
92 | .Pa /etc/ssh/ssh_config.d/*.conf | ||
93 | files are included at the start of the system-wide configuration file, so | ||
94 | options set there will override those in | ||
95 | .Pa /etc/ssh/ssh_config. | ||
96 | .Pp | ||
90 | The file contains keyword-argument pairs, one per line. | 97 | The file contains keyword-argument pairs, one per line. |
91 | Lines starting with | 98 | Lines starting with |
92 | .Ql # | 99 | .Ql # |