Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

config/rootfiles/oldcore/185/update.sh

@@ -67,7 +67,8 @@ rm -rvf \
 	/var/ipfire/geoip-functions.pl \
 	/var/ipfire/dhcpc/dhcpcd-hooks/00-linux \
 	/var/ipfire/dhcpc/dhcpcd-hooks/02-dump \
-	/var/lib/location/tmp*
+	/var/lib/location/tmp* \
+	/usr/lib/liblzma.so.5.6.*
 
 # update linker config
 ldconfig
@@ -88,12 +89,15 @@ chmod -v 640 /etc/sudoers.d/*
 # Start services
 telinit u
 /etc/init.d/sshd restart
+/etc/init.d/apache restart
 /etc/init.d/suricata restart
 /etc/init.d/unbound restart
 /etc/init.d/ntp start
 if [ -f /var/ipfire/proxy/enable ]; then
 	/etc/init.d/squid start
 fi
+/etc/init.d/collectd restart
+
 ## Modify ovpnconfig according to bug 13548 for no-pass entry for N2N client connections
 # Check if ovpnconfig exists and is not empty
 if [ -s /var/ipfire/ovpn/ovpnconfig ]; then