From 87b45f69913b7687433fb214fc97064fccd7214b Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 4 Jan 2023 19:37:30 +0100 Subject: 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) --- src/conf_mode/system-option.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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): -- cgit v1.2.3