Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / config / rootfiles / core / 45 / update.sh

diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh
index 40d08d4381853b09e813c5734780ac0212754715..b7af7c9c0e72655397a2534d3df7eb6ab95ef63b 100644 (file)
--- a/config/rootfiles/core/45/update.sh
+++ b/config/rootfiles/core/45/update.sh
@@ -24,15 +24,40 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
+#
+# Remove core updates from pakfire cache to save space...
+rm -f /var/cache/pakfire/core-upgrade-*.ipfire
 #
 #Stop services
+echo Stopping Proxy
+/etc/init.d/squid stop 2>/dev/null
+echo Stopping vpn-watch
+killall vpn-watch
 
 #
 #Extract files
 extract_files
 
+#
+# Remove some addon cronjobs if the addons are not installed
+[ ! -e /opt/pakfire/db/installed/meta-cacti ] && rm -f /etc/fcron.cyclic/cacti.cron
+[ ! -e /opt/pakfire/db/installed/meta-gnump3d ] && rm -f /etc/fcron.daily/gnump3d-index
+[ ! -e /opt/pakfire/db/installed/meta-asterisk ] && rm -f /etc/fcron.minutely/wakeup.sh
+
+# Remove disable cron mails...
+sed "s|MAILTO=root|MAILTO=|g" < /var/spool/cron/root.orig > /var/tmp/root.tmp
+fcrontab /var/tmp/root.tmp
+
 #
 #Start services
+echo Starting Proxy
+/etc/init.d/squid start 2>/dev/null
+echo Rewriting Outgoing FW Rules
+/var/ipfire/outgoing/bin/outgoingfw.pl
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+       echo Starting vpn-watch
+       /usr/local/bin/vpn-watch &
+fi
 
 #
 #Update Language cache