Core Update 182: Ship and restart OpenSSH

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

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

diff --git a/config/rootfiles/core/182/update.sh b/config/rootfiles/core/182/update.sh
index 5d0bb168786705274be164a670f063ee7b3f536a..b00218f5103aa0af9909002af7109a6a436d9096 100644 (file)
--- a/config/rootfiles/core/182/update.sh
+++ b/config/rootfiles/core/182/update.sh
@@ -35,6 +35,7 @@ done
 /etc/rc.d/init.d/ipsec stop
 /etc/rc.d/init.d/squid stop
 /etc/rc.d/init.d/unbound stop
+/etc/rc.d/init.d/sshd stop
 
 # Extract files
 extract_files
@@ -66,8 +67,14 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Start services
 /etc/init.d/unbound start
+if grep -q "ENABLE_SSH=on" /var/ipfire/remote/settings; then
+       /etc/init.d/sshd start
+fi
 if [ -f /var/ipfire/proxy/enable ]; then
        /etc/init.d/squid start
 fi