X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.hourly;h=1dcc2abb5bb1159e0ee5af633bac126a384fe6d3;hb=6411bdb24f02bb6ab902502ae4b0c78bf7dc9034;hp=e543434a9f5e24ca98b0c854043d8f01938b7105;hpb=85e6c424f8c5d1a6f7778b683696322cc2256fc1;p=dak.git

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index e543434a..1dcc2abb 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -4,18 +4,21 @@
 
 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
-dak queue-report -8 -d accepted,new,byhand,proposedupdates
+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
+
+$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