From 57fca79636b783dc4be2df1bc1ff12a0ce79d988 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 13 Jan 2021 21:40:36 +0100
Subject: ssh: T3212: do not make /run/sshd directory disappear on failure

---
 data/templates/ssh/override.conf.tmpl | 5 +++--
 data/templates/ssh/sshd_config.tmpl   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'data/templates/ssh')

diff --git a/data/templates/ssh/override.conf.tmpl b/data/templates/ssh/override.conf.tmpl
index 843aa927b..0abde6248 100644
--- a/data/templates/ssh/override.conf.tmpl
+++ b/data/templates/ssh/override.conf.tmpl
@@ -1,4 +1,4 @@
-{% set vrf_command = '/sbin/ip vrf exec ' + vrf + ' ' if vrf is defined else '' %}
+{% set vrf_command = 'ip vrf exec ' + vrf + ' ' if vrf is defined else '' %}
 [Unit]
 StartLimitIntervalSec=0
 After=vyos-router.service
@@ -7,5 +7,6 @@ ConditionPathExists={{config_file}}
 [Service]
 ExecStart=
 ExecStart={{vrf_command}}/usr/sbin/sshd -f {{config_file}} -D $SSHD_OPTS
+Restart=always
 RestartSec=10
-
+RuntimeDirectoryPreserve=yes
diff --git a/data/templates/ssh/sshd_config.tmpl b/data/templates/ssh/sshd_config.tmpl
index 7d7257cae..2f2b78a66 100644
--- a/data/templates/ssh/sshd_config.tmpl
+++ b/data/templates/ssh/sshd_config.tmpl
@@ -28,6 +28,7 @@ Subsystem sftp /usr/lib/openssh/sftp-server
 UsePAM yes
 PermitRootLogin no
 PidFile /run/sshd/sshd.pid
+AddressFamily any
 
 #
 # User configurable section
-- 
cgit v1.2.3