X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.hourly;h=ccfbe38c25c656527bb0a9d4306f578ab4cf6df0;hb=a230888892aa3638bd2f51446a788659c182c2eb;hp=24955023e4add65bb5da426ca25b5ec85f0ef633;hpb=b9595afb11d0e642d7dd855d24e952e64ce642b7;p=dak.git

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 24955023..ccfbe38c 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -4,18 +4,29 @@
 
 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