diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-01-07 21:30:00 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-01-07 23:01:51 +0100 |
| commit | 65ee3a66077c7708f366d9492033634024887545 (patch) | |
| tree | 70a22edcd7a52fe1d41f2fcbbab61da2b149d938 | |
| parent | b9feaf0d6be3adf179df6f35fcd8416d128750f6 (diff) | |
| download | vyos-1x-65ee3a66077c7708f366d9492033634024887545.tar.gz vyos-1x-65ee3a66077c7708f366d9492033634024887545.zip | |
ssh: T2635: change sshd_config path to /run/sshd
| -rw-r--r-- | data/templates/ssh/sshd_config.tmpl | 1 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_service_ssh.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/ssh.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/data/templates/ssh/sshd_config.tmpl b/data/templates/ssh/sshd_config.tmpl index 52d537aca..1dc700d38 100644 --- a/data/templates/ssh/sshd_config.tmpl +++ b/data/templates/ssh/sshd_config.tmpl @@ -27,6 +27,7 @@ Banner /etc/issue.net Subsystem sftp /usr/lib/openssh/sftp-server UsePAM yes PermitRootLogin no +PidFile /run/sshd/sshd.pid # # User configurable section diff --git a/smoketest/scripts/cli/test_service_ssh.py b/smoketest/scripts/cli/test_service_ssh.py index 0bb907c3a..e9e4639fc 100755 --- a/smoketest/scripts/cli/test_service_ssh.py +++ b/smoketest/scripts/cli/test_service_ssh.py @@ -25,7 +25,7 @@ from vyos.util import process_named_running from vyos.util import read_file PROCESS_NAME = 'sshd' -SSHD_CONF = '/run/ssh/sshd_config' +SSHD_CONF = '/run/sshd/sshd_config' base_path = ['service', 'ssh'] vrf = 'ssh-test' diff --git a/src/conf_mode/ssh.py b/src/conf_mode/ssh.py index 8f99053d2..07c057fd7 100755 --- a/src/conf_mode/ssh.py +++ b/src/conf_mode/ssh.py @@ -28,7 +28,7 @@ from vyos import ConfigError from vyos import airbag airbag.enable() -config_file = r'/run/ssh/sshd_config' +config_file = r'/run/sshd/sshd_config' systemd_override = r'/etc/systemd/system/ssh.service.d/override.conf' def get_config(config=None): |