[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a6b15086d96af7b10b280cbb897e7b2200a37e53

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a6b15086d96af7b10b280cbb897e7b2200a37e53

[git]

[-- Attachment #1: Type: text/plain, Size: 2452 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  a6b15086d96af7b10b280cbb897e7b2200a37e53 (commit)
      from  191976efbdd0dd6c8b5feac6706ecfbe84c5406c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a6b15086d96af7b10b280cbb897e7b2200a37e53
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Aug 22 01:40:26 2015 +0100

    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(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/cron/crontab                | 2 --
 config/rootfiles/core/94/update.sh | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/cron/crontab b/config/cron/crontab
index d5e5d7e..9ba5245 100644
--- 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 99c5e4f..1ba38e0 100644
--- 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


hooks/post-receive
--
IPFire 2.x development tree