X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.hourly;h=30e81b59e0d8a20af82871e1ed56117272133f7b;hb=610b08292f816e81e7dea5446bbdd22effb434d7;hp=79fafd45cc7699998cff15db492b35c1d0b3670c;hpb=4fbe76ca4e30a4515d2111a27d3067259f890355;p=dak.git

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 79fafd45..30e81b59 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -4,16 +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
 
 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
 dak show-new > /dev/null
-$base/dak/tools/queue_rss.py -q $queuedir/new -o $webdir/rss/ -d $base/misc
-$base/dak/tools/removals.pl > $webdir/rss/removals.rss
+
+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 $configdir/removalsrss.rc > $webdir/rss/removals.rss
 
 $scriptsdir/generate-di