From: Joerg Jaspert Date: Wed, 20 Jan 2010 22:19:30 +0000 (+0100) Subject: removals, crontab X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=815e140957b38d399152ad5cf5261157a83e5f2c;p=dak removals, crontab add generation of removals-full.txt, doesnt need to be in my own crontab. also add the crontab into VCS, even though crontab is not yet automagically updated from VCS. Signed-off-by: Joerg Jaspert --- diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly index 4dab8d88..33452374 100755 --- a/config/debian/cron.hourly +++ b/config/debian/cron.hourly @@ -4,15 +4,20 @@ set -e set -u + export SCRIPTVARS=/srv/ftp.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 + $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 diff --git a/config/debian/crontab b/config/debian/crontab new file mode 100644 index 00000000..f7f68123 --- /dev/null +++ b/config/debian/crontab @@ -0,0 +1,18 @@ +MAILTO=cron@ftp-master.debian.org +PATH=/usr/local/bin:/usr/bin:/bin +# m h dom mon dow command +2,17,32,47 * * * * /srv/ftp.debian.org/dak/config/debian/cron.unchecked +0 * * * * /srv/ftp.debian.org/dak/config/debian/cron.hourly +52 1,7,13,19 * * * /srv/ftp.debian.org/dak/config/debian/cron.dinstall +#### And an alternate line, for the times the release team wants it half an hour late. +####22 2,9,14,20 * * * /srv/ftp.debian.org/dak/config/debian/cron.dinstall +0 12 * * 0 /srv/ftp.debian.org/dak/config/debian/cron.weekly +6 0 1 * * /srv/ftp.debian.org/dak/config/debian/cron.monthly +@reboot /srv/ftp.debian.org/dak/config/debian/cron.reboot + +0 0 * * * crontab -l > ~/crontab.out + +# We do like our queued and make sure it will always be there. +# Luckily it checks itself and doesn't start if it already runs +@reboot /srv/queued/debianqueued-0.9/debianqueued +*/10 * * * * /srv/queued/debianqueued-0.9/debianqueued 2>/dev/null diff --git a/web/index.html b/web/index.html index 32f2f82f..e0d6a100 100644 --- a/web/index.html +++ b/web/index.html @@ -153,6 +153,7 @@
  • log of removals for 2006
  • log of removals for 2007
  • log of removals for 2008
  • +
  • log of removals for 2009
  • Additionally we provide a full