X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.hourly;h=ce692b013880f25f0b85f887102031718e00b0ce;hb=356f4f93a9d0b29c0878111f7c3eee194f6571e5;hp=355cc50a0dd6f041126d3712d902ff7725da093b;hpb=d4ede014e6f4df2f3ea798e610df8d1dbfbf2843;p=dak.git

diff --git a/config/debian-security/cron.hourly b/config/debian-security/cron.hourly
index 355cc50a..ce692b01 100755
--- a/config/debian-security/cron.hourly
+++ b/config/debian-security/cron.hourly
@@ -3,12 +3,13 @@
 # Executed hourly via cron, out of dak's crontab.
 
 set -e
+set -o pipefail
 set -u
 
 export SCRIPTVARS=/srv/security-master.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 
-# dak import-users-from-passwd
+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
@@ -24,7 +25,7 @@ export SCRIPTVARS=/srv/security-master.debian.org/dak/config/debian-security/var
 #$base/dak/tools/queue_rss.py -q $queuedir/new -o $webdir/rss/ -d $base/misc -l $base/log/
 #$base/dak/tools/removals.pl $configdir/removalsrss.rc > $webdir/removals.rss
 
-#$scriptsdir/generate-di
+#$scriptsdir/generate-d-i
 
 # do the buildd key updates
 BUILDDFUN=$(mktemp -p "${TMPDIR}" BUILDDFUN.XXXXXX)
@@ -38,6 +39,6 @@ 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
+cat "${BUILDDFUN}" | mail -a "X-Debian: DAK" -e -s "[$(hostname -s)] Buildd key changes ${DATE}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" buildd-keys@ftp-master.debian.org
 
 rm -f "${BUILDDFUN}"