summaryrefslogtreecommitdiff
path: root/data/templates/ssh
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-06-11 15:58:18 +0200
committerChristian Poessinger <christian@poessinger.com>2020-06-11 15:58:18 +0200
commit5deb12c509bea6e353c3b4c3174f040895646cf8 (patch)
tree0405621fdec0de0430bdf3bbe5b37b9aa9709701 /data/templates/ssh
parentc2c91c4a7c74c851236a40759fa56521f39cd2cc (diff)
downloadvyos-1x-5deb12c509bea6e353c3b4c3174f040895646cf8.tar.gz
vyos-1x-5deb12c509bea6e353c3b4c3174f040895646cf8.zip
ssh: T2321: add VRF support
Diffstat (limited to 'data/templates/ssh')
-rw-r--r--data/templates/ssh/override.conf.tmpl8
-rw-r--r--data/templates/ssh/sshd_config.tmpl8
2 files changed, 10 insertions, 6 deletions
diff --git a/data/templates/ssh/override.conf.tmpl b/data/templates/ssh/override.conf.tmpl
new file mode 100644
index 000000000..1013d4b48
--- /dev/null
+++ b/data/templates/ssh/override.conf.tmpl
@@ -0,0 +1,8 @@
+[Service]
+ExecStart=
+{% if vrf %}
+ExecStart=/sbin/ip vrf exec {{ vrf }} /usr/sbin/sshd -D $SSHD_OPTS
+{% else %}
+ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
+{% endif %}
+
diff --git a/data/templates/ssh/sshd_config.tmpl b/data/templates/ssh/sshd_config.tmpl
index 949a8558f..08fe56655 100644
--- a/data/templates/ssh/sshd_config.tmpl
+++ b/data/templates/ssh/sshd_config.tmpl
@@ -28,15 +28,11 @@ UsePAM yes
# address maps back to the very same IP address.
UseDNS {{ host_validation }}
-# Specifies the port number that sshd listens on. The default is 22.
+# Specifies the port number that sshd listens on. The default is 22.
# Multiple options of this type are permitted.
-{% if mport|length != 0 %}
-{% for p in mport %}
+{% for p in port %}
Port {{ p }}
{% endfor %}
-{% else %}
-Port {{ port }}
-{% endif %}
# Gives the verbosity level that is used when logging messages from sshd
LogLevel {{ log_level }}