Do not pass sendmail options to mail.

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

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 65b18b7c0f67f70655bfcdd539eb70f7075b419d..37ddf92c30ebe33a4283770de6cd9c5e6a8a7887 100755 (executable)
--- 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
-/usr/bin/epydoc -q --html --graph all --css blue -n DAK -o $webdir/epydoc --include-log --graph all --show-imports $masterdir/dak/ $masterdir/dakweb/
+# 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" 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}" buildd-keys@ftp-master.debian.org
 
 rm -f "${BUILDDFUN}"