Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

[ipfire-2.x.git] / config / cron / crontab

diff --git a/config/cron/crontab b/config/cron/crontab
index 92c3a78ba74cf9267daaadd49d2bd6c5d362877b..d5e5d7e9f040fcf409b8cd49e8630b6c298c4c7e 100644 (file)
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@ -24,12 +24,10 @@ HOME=/
 */5 * * * *    /usr/local/bin/makegraphs >/dev/null
 17 5 * * *     /etc/init.d/tmpfs backup >/dev/null
 
-# Force update the dynamic dns registration once a week
-# Force update even if IP has not changed once a month if 'minimize update' selected in GUI
-# to avoid account declared as dead
-*/5 * * * *    [ -f "/var/ipfire/red/active" ] && /usr/local/bin/setddns.pl
-9 2 * * 0      [ -f "/var/ipfire/red/active" ] && /usr/local/bin/setddns.pl -f
-3 2 1 * *      [ -f "/var/ipfire/red/active" ] && /usr/local/bin/setddns.pl -f -m
+# Update dynamic DNS records every five minutes.
+# Force an update once a month
+*/5 * * * *    [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all
+3 2 1 * *      [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force
 
 # Logwatch
 01 0 * * *     /usr/local/bin/logwatch > /var/log/logwatch/`date -I -d yesterday`; \
@@ -59,3 +57,6 @@ HOME=/
 # Re-read firewall rules every Sunday in March, October and November to take care of daylight saving time
 00 3 * 3 0          /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
 00 2 * 10-11 0      /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
+
+# Update GeoIP database once a month.
+%monthly,random * * * [ -f "/var/ipfire/red/active" ] && /usr/local/bin/xt_geoip_update >/dev/null 2>&1