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,oldproposedupdates
+dak queue-report -n > $webdir/new.html
+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
-$base/dak/tools/removals.pl > $webdir/rss/removals.rss
+
+# do not run show-new and other stuff in parallel
+LOCKFILE="$lockdir/unchecked.lock"
+if lockfile -r16 $LOCKFILE 2> /dev/null; then
+ dak show-new > /dev/null
+ rm -f $LOCKFILE
+fi
+
+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