X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.hourly;h=cde688b8f6f3c375941dff3bb9d5506470227977;hb=b1891efd3f1eda5eef424cb586aaa7357d32f411;hp=e10365502535b8f2a0bacd183665b72aaa4b4b22;hpb=12e10a29eed2843efda0dfa13483a81877216cec;p=dak.git

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index e1036550..cde688b8 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -20,15 +20,22 @@ dak import-users-from-passwd
 
 # 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 -r $webdir/stat
-dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
+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
@@ -42,9 +49,9 @@ $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 ries-sync ries-sync1 ries-sync2 sync
 
-$scriptsdir/generate-di
+$scriptsdir/generate-d-i
 
 # Push files over to security
 #pg_dump -a -F p -t files | sed -e "s,^COPY files (,DELETE FROM external_files; COPY external_files (," | xz -3 | \
@@ -53,6 +60,11 @@ $scriptsdir/generate-di
 # The key should run the following command:
 #        'xzcat | pg_restore -1 -a'
 
+# 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)
 exec >> "${BUILDDFUN}" 2>&1