X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.hourly;h=a037ee92b130e728b3a2a7e391d6c633c2fbb828;hb=a2d567e54f8bb92d85e69604a0807d8d1476c109;hp=0b06f026b0fa1196a7ccdf1de44861cd00870b37;hpb=4df4edcb5bf269c56297c7c659287ec8023b8543;p=dak.git

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 0b06f026..a037ee92 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -47,8 +47,8 @@ cat removals.822 >> removals-full.822
 $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/rss/removals.rss
 
-cd $masterdir
-timeout -k 180 120  /usr/bin/epydoc -q --html --graph all --css blue -n DAK -o $webdir/epydoc --include-log --graph all --show-imports $masterdir/dak/ $masterdir/dakweb/ || true
+# cd $masterdir
+# timeout -k 180 120  /usr/bin/epydoc -q --html --graph all --css blue -n DAK -o $webdir/epydoc --include-log --graph all --show-imports $masterdir/dak/ $masterdir/dakweb/ || true
 
 # Tell ries to sync its tree
 ${scriptsdir}/sync-dd dd-sync dd-sync1 dd-sync2 sync
@@ -57,8 +57,8 @@ $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
+    | dak acl set-fingerprints backports \
+    | mail -a "X-Debian: DAK" -e -s "backports: acl changes" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" backports-team@debian.org
 
 # do the buildd key updates
 BUILDDFUN=$(mktemp -p "${TMPDIR}" BUILDDFUN.XXXXXX)
@@ -73,6 +73,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}"