core115: Ship updated apache

[ipfire-2.x.git] / config / rootfiles / core / 115 / update.sh

diff --git a/config/rootfiles/core/115/update.sh b/config/rootfiles/core/115/update.sh
index e0ee121ce7a34141fa2d25cf392def98783a9c84..fe978c0e90eeecf02c0b3a9dd0ec6324134793cd 100644 (file)
--- a/config/rootfiles/core/115/update.sh
+++ b/config/rootfiles/core/115/update.sh
@@ -45,9 +45,22 @@ ldconfig
 #/usr/local/bin/update-lang-cache
 
 # Start services
+/etc/rc.d/init.d/apache2 restart
 openvpnctrl -s
 openvpnctrl -sn2n
 
+grep -q "captivectrl" /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
+# Cleanup captive clients
+%hourly * /usr/bin/captive-cleanup
+
+# Reload captive firewall rules
+%nightly * 23-1   /usr/local/bin/captivectrl >/dev/null
+EOF
+fcrontab -z
+
+# Load captive portal configuration
+/etc/rc.d/init.d/apache2 reload
+/etc/rc.d/init.d/firewall restart
 
 # This update need a reboot...
 #touch /var/run/need_reboot