summaryrefslogtreecommitdiff
path: root/src/conf_mode/system-option.py
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2023-01-04 19:37:30 +0100
committerChristian Poessinger <christian@poessinger.com>2023-01-04 19:37:30 +0100
commit7763de6c4b93d3372ab3f4572d9fa6b7536102b3 (patch)
tree63d57031a28c22bc22583f7402e47675dc90f47b /src/conf_mode/system-option.py
parentbb97f80d358adea1dbf7eaff5d413ccfb95b0441 (diff)
downloadvyos-1x-7763de6c4b93d3372ab3f4572d9fa6b7536102b3.tar.gz
vyos-1x-7763de6c4b93d3372ab3f4572d9fa6b7536102b3.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 vommit places the VyOS SSH options under /etc/ssh/ssh_config.d/ leaving the common override system alive.
Diffstat (limited to 'src/conf_mode/system-option.py')
-rwxr-xr-xsrc/conf_mode/system-option.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conf_mode/system-option.py b/src/conf_mode/system-option.py
index 36dbf155b..85fc6a83f 100755
--- a/src/conf_mode/system-option.py
+++ b/src/conf_mode/system-option.py
@@ -32,7 +32,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):