Core Update 173: Ship and restart OpenSSH

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/rootfiles/core/173/filelists/openssh b/config/rootfiles/core/173/filelists/openssh
new file mode 120000 (symlink)
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/173/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file

diff --git a/config/rootfiles/core/173/update.sh b/config/rootfiles/core/173/update.sh
index fb7959d2cebe18e9bbf11c8136782fca848f2e59..c2bfe25b13a05ce593439862f84dbbc9f2961af7 100644 (file)
--- a/config/rootfiles/core/173/update.sh
+++ b/config/rootfiles/core/173/update.sh
@@ -48,6 +48,7 @@ done
 /etc/rc.d/init.d/ipsec stop
 /usr/local/bin/openvpnctrl -k
 /usr/local/bin/openvpnctrl -kn2n
+/etc/rc.d/init.d/sshd stop
 
 KVER="xxxKVERxxx"
 
@@ -130,8 +131,14 @@ done
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Start services
 /etc/rc.d/init.d/apache start
+if grep -q "ENABLE_SSH=on" /var/ipfire/remote/settings; then
+       /etc/init.d/sshd start
+fi
 if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then
        /usr/local/bin/openvpnctrl -s
        /usr/local/bin/openvpnctrl -sn2n