Adjust way of syncing the dd-accessible copy

[dak.git] / config / debian / cron.hourly

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index f559026ca597fb93449ce0de70f5ccb84fe52240..87fad61c9c3ed82e9c64c9298c3292d3d410c0a6 100755 (executable)
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -9,6 +9,7 @@ set -u
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
+PROGRAM="Hourly"
 ########################################################################
 # Functions                                                            #
 ########################################################################
@@ -16,19 +17,27 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . "${configdir}/common"
 
 dak import-users-from-passwd
-dak queue-report -n > $webdir/new.html
-dak queue-report -8 -d new,byhand,proposedupdates,oldproposedupdates -r $webdir/stat
-dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
-dak graph -n new,byhand,p-u-new,o-p-u-new,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
 
 # do not run show-new and other stuff in parallel
 LOCKFILE="$lockdir/unchecked.lock"
+cleanup() {
+    rm -f "${LOCKFILE}"
+}
+
 if lockfile -r16 $LOCKFILE 2> /dev/null; then
+    trap cleanup EXIT
     do_new
     dak show-new > /dev/null || true
-    rm -f $LOCKFILE
+    cleanup
+    trap - EXIT
 fi
 
+dak queue-report -n > $webdir/new.html
+dak queue-report -n -d backports-new > ${webdir}/backports-new.html
+dak queue-report -8 -d new,byhand,stable-new,oldstable-new,backports-new -r $webdir/stat
+sudo -u dak-unpriv dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
+dak graph -n new,byhand,stable-new,oldstable-new,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
+
 cd $webdir
 cat removals-20*.txt > removals-full.txt
 cat removals.txt >> removals-full.txt
@@ -40,10 +49,14 @@ $base/dak/tools/removals.pl $configdir/removalsrss.rc > $webdir/rss/removals.rss
 
 
 # Tell ries to sync its tree
-ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30 -2 -i ${base}/s3kr1t/pushddmirror dak@ries.debian.org sync
+${scriptsdir}/sync-dd dd-sync dd-sync1 dd-sync2 sync
 
-$scriptsdir/generate-di
+$scriptsdir/generate-d-i
 
+# Update backports ACL
+sudo -u dak-unpriv cat /srv/backports-master.debian.org/etc/acl \
+  | dak acl set-fingerprints backports \
+  | mail -a "X-Debian: DAK" -e -s "backports: acl changes" backports-team@debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
 
 # do the buildd key updates
 BUILDDFUN=$(mktemp -p "${TMPDIR}" BUILDDFUN.XXXXXX)