X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.hourly;h=0c06b74f3c3196ad92d134b88c9788c53a07427c;hb=0872b2e0b78670c91fd2bf0bda52e5761e079820;hp=9dd1450473a24d674db70207cc722419097e435a;hpb=0c4a701713c3cc1477d1a40e32f8a74aed66b022;p=dak.git

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 9dd14504..0c06b74f 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -4,19 +4,23 @@
 
 set -e
 set -u
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
-date -u > $ftpdir/project/trace/ftp-master.debian.org
-echo "Using dak v1" >> $ftpdir/project/trace/ftp-master.debian.org
-echo "Running on host: $(hostname -f)" >> $ftpdir/project/trace/ftp-master.debian.org
 dak import-users-from-passwd
 dak queue-report -n > $webdir/new.html
-# We used to have accepted in here, but it doesn't exist in that form any more
 dak queue-report -8 -d new,byhand,proposedupdates,oldproposedupdates
 dak show-deferred > ${webdir}/deferred.html
-#cd $queuedir/new ; dak show-new *.changes > /dev/null
-$base/dak/tools/queue_rss.py -q $queuedir/new -o $webdir/rss/ -d $base/misc
+dak show-new > /dev/null
+
+cd $webdir
+cat removals-20*.txt > removals-full.txt
+cat removals.txt >> removals-full.txt
+cat removals-20*.822 > removals-full.822
+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 > $webdir/rss/removals.rss
 
 $scriptsdir/generate-di