From: Peter Müller Date: Wed, 23 Aug 2023 14:43:00 +0000 (+0000) Subject: Core Update 179: Only start services if they are enabled X-Git-Tag: v2.27-core179~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb7869feb2c9b8665c2f9e77c2d6e2f0ff9ad832;p=ipfire-2.x.git Core Update 179: Only start services if they are enabled Doing so avoids situations where a service is started without being configured to do so, thus reducing the potential for confusion and exposure of services not intended to be exposed by the user. Signed-off-by: Peter Müller Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/179/update.sh b/config/rootfiles/core/179/update.sh index 636792d820..df89d702ec 100644 --- a/config/rootfiles/core/179/update.sh +++ b/config/rootfiles/core/179/update.sh @@ -86,9 +86,13 @@ migrate_extrahd # Start services /etc/init.d/udev restart -/etc/init.d/squid restart -/usr/local/bin/openvpnctrl -s -/usr/local/bin/openvpnctrl -sn2n +if [ -f /var/ipfire/proxy/enable ]; then + /etc/init.d/squid restart +fi +if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then + /usr/local/bin/openvpnctrl -s + /usr/local/bin/openvpnctrl -sn2n +fi # This update needs a reboot... touch /var/run/need_reboot