From fa2f6cb6df9fbbf4ddbd7f7bfcfbc995f6d1e9cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20M=C3=BCller?= Date: Fri, 3 Feb 2023 16:07:55 +0000 Subject: [PATCH] Core Update 173: Ship and restart OpenSSH MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Müller --- config/rootfiles/core/173/filelists/openssh | 1 + config/rootfiles/core/173/update.sh | 7 +++++++ 2 files changed, 8 insertions(+) create mode 120000 config/rootfiles/core/173/filelists/openssh diff --git a/config/rootfiles/core/173/filelists/openssh b/config/rootfiles/core/173/filelists/openssh new file mode 120000 index 0000000000..d8c77fd8e7 --- /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 fb7959d2ce..c2bfe25b13 100644 --- 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 -- 2.39.5