diff options
| author | Christian Poessinger <christian@poessinger.com> | 2023-01-04 19:37:30 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2023-01-08 08:33:08 +0100 |
| commit | 87b45f69913b7687433fb214fc97064fccd7214b (patch) | |
| tree | 9365d1422e2ca7834896771363a9903fc430133c | |
| parent | de1fa852c38b8eff22cf0c1a34abd13379c0705c (diff) | |
| download | vyos-1x-87b45f69913b7687433fb214fc97064fccd7214b.tar.gz vyos-1x-87b45f69913b7687433fb214fc97064fccd7214b.zip | |
ssh: T2651: use Debian style include directve for ssh_config.d
Commit 846e306700a ("ssh: T2651: add cli options for source address") added
support for a basic SSH client option, but it grabbed the entire
/etc/ssh/ssh_config file without the ability to make custom user
adjustments via the /etc/ssh/ssh_config.d/ folder.
This commit places the VyOS SSH options under /etc/ssh/ssh_config.d/ leaving
the common override system alive.
(cherry picked from commit 7763de6c4b93d3372ab3f4572d9fa6b7536102b3)
| -rwxr-xr-x | src/conf_mode/system-option.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conf_mode/system-option.py b/src/conf_mode/system-option.py index ddb91aeaf..2949bcfa9 100755 --- a/src/conf_mode/system-option.py +++ b/src/conf_mode/system-option.py @@ -31,7 +31,7 @@ from vyos import airbag airbag.enable() curlrc_config = r'/etc/curlrc' -ssh_config = r'/etc/ssh/ssh_config' +ssh_config = r'/etc/ssh/ssh_config.d/91-vyos-ssh-client-options.conf' systemd_action_file = '/lib/systemd/system/ctrl-alt-del.target' def get_config(config=None): |