From: Peter Müller <peter.mueller@ipfire.org>
Date: Wed, 22 Nov 2023 16:14:26 +0000 (+0000)
Subject: Core Update 182: Ship and restart OpenSSH
X-Git-Tag: v2.27-core182~16^2~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2087214036033f96fcde31c2a6d52530b01160d8;p=ipfire-2.x.git

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
index 0000000000..d8c77fd8e7
--- /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 5d0bb16878..b00218f510 100644
--- 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