ddns: Remove forced update

DDNS will automatically take care of the updates by tracking
them in a database and re-execute the update after 30 days.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/cron/crontab b/config/cron/crontab
index d5e5d7e9f040fcf409b8cd49e8630b6c298c4c7e..9ba52450a3a18804dc98ead1caa49dc2ef6c9a79 100644 (file)
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@ -25,9 +25,7 @@ HOME=/
 17 5 * * *     /etc/init.d/tmpfs backup >/dev/null
 
 # 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`; \

diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh
index 99c5e4f630894babc10b156731ee1f1c3c6a2271..1ba38e027d75cd865abbb870f415690a6d416b29 100644 (file)
--- a/config/rootfiles/core/94/update.sh
+++ b/config/rootfiles/core/94/update.sh
@@ -51,6 +51,11 @@ mv -f /etc/ssh/ssh_host_dsa_key{,.old}
 mv -f /etc/ssh/ssh_host_key{,.old}
 mv -f /etc/ssh/ssh_host_rsa_key{,.old}
 
+# Update crontab
+sed -i /var/spool/cron/root.orig -e "/Force an update once a month/d"
+sed -i /var/spool/cron/root.orig -e "/ddns update-all --force/d"
+fcrontab -z &>/dev/null
+
 # Start services
 /etc/init.d/dnsmasq start
 /etc/init.d/sshd start