X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fcron.hourly;h=627c8b0960b4b7cc1eeeab1bc602a98fa475a763;hb=e3d2c47d31abaee8ba54fa215704d81bd2be0073;hp=5357653e9fd7b4968a3b5d39c42672d75014c70d;hpb=b43634b6faf221ee10fc63116baead379f68f92f;p=dak.git

diff --git a/config/backports/cron.hourly b/config/backports/cron.hourly
index 5357653e..627c8b09 100755
--- a/config/backports/cron.hourly
+++ b/config/backports/cron.hourly
@@ -1,8 +1,9 @@
-#! /bin/sh
+#! /bin/bash
 #
 # Executed hourly via cron, out of dak's crontab.
 
 set -e
+set -o pipefail
 set -u
 
 export SCRIPTVARS=/srv/backports-master.debian.org/dak/config/backports/vars
@@ -10,10 +11,9 @@ export SCRIPTVARS=/srv/backports-master.debian.org/dak/config/backports/vars
 
 dak import-users-from-passwd
 dak queue-report -n > $webdir/new.html
-dak queue-report -8 -d new,byhand,proposedupdates,oldproposedupdates -r $webdir
-#dak show-deferred > ${webdir}/deferred.html
-dak graph -n new,byhand,proposedupdates,oldproposedupdates -r $webdir -i $webdir -x $configdir/rrd-release-freeze-dates
-#dak graph -n new,byhand,proposedupdates,oldproposedupdates,deferred -r $webdir -i $webdir -x $configdir/rrd-release-freeze-dates
+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,proposedupdates,oldproposedupdates,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
 dak show-new > /dev/null
 
 # cd $webdir
@@ -26,3 +26,19 @@ dak show-new > /dev/null
 $base/dak/tools/removals.pl $configdir/removalsrss.rc > $webdir/removals.rss
 
 #$scriptsdir/generate-di
+
+# do the buildd key updates
+BUILDDFUN=$(mktemp -p "${TMPDIR}" BUILDDFUN.XXXXXX)
+exec >> "${BUILDDFUN}" 2>&1
+#${scriptsdir}/buildd-remove-keys
+#${scriptsdir}/buildd-add-keys
+#${scriptsdir}/buildd-prepare-dir
+for keyring in $(dak admin k list-binary); do
+    dak import-keyring --generate-users "%s" ${keyring}
+done
+exec >>/dev/null 2>&1
+
+DATE=$(date -Is)
+cat "${BUILDDFUN}" | mail -a "X-Debian: DAK" -e -s "[$(hostname -s)] Buildd key changes ${DATE}" buildd-keys@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+
+rm -f "${BUILDDFUN}"