X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.hourly;h=3c58395c0c09a6d7b16a8abc357a9601c657d8a7;hb=f54c87736c85e9c72b1693f9db50848992f88f61;hp=c82754ffa0b7d86e4d8a82e2e1022cfc4f18d775;hpb=4594a6e250e45dd91ce55b6d199bc07349062cda;p=dak.git

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index c82754ff..3c58395c 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -33,8 +33,8 @@ if lockfile -r16 $LOCKFILE 2> /dev/null; then
 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 queue-report -n -d backports-new,backports-policy > ${webdir}/backports-new.html
+dak queue-report -8 -d new,byhand,stable-new,oldstable-new,backports-new -r $webdir/stat
 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
 
@@ -47,23 +47,18 @@ 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
 
-# Tell ries to sync its tree
-${scriptsdir}/sync-dd ries-sync ries-sync1 ries-sync2 sync
+# Tell the public mirror to sync its tree
+${scriptsdir}/sync-dd dd-sync dd-sync1 dd-sync2 sync
 
-$scriptsdir/generate-di
-
-# 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 | \
-#        ssh -o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=30 -2 -i ${base}/s3kr1t/push-external_files dak@wherever sync
-#
-# The key should run the following command:
-#        'xzcat | pg_restore -1 -a'
+$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" team@backports.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)
@@ -78,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}"