Merge branch 'master' into security

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

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 4dab8d88e00c50379d851995fb3566e7e3b22a01..30e81b59e0d8a20af82871e1ed56117272133f7b 100755 (executable)
--- 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
+
+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
+$base/dak/tools/removals.pl $configdir/removalsrss.rc > $webdir/rss/removals.rss
 
 $scriptsdir/generate-di