X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.daily;h=27c674cb0571184d61f71f81cb5a658510e17b5e;hb=ceba4993a87c1b416a01c814e37c3277775961bb;hp=77832a0546375c63cbe60aa812b6ea3bd7a6e66a;hpb=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak.git

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 77832a05..27c674cb 100755
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -1,14 +1,15 @@
 #! /bin/sh
 #
-# Executed daily via cron, out of katie's crontab.
+# Executed daily via cron, out of dak's crontab.
 
 set -e
-export SCRIPTVARS=/org/ftp.debian.org/katie/vars
+export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 ################################################################################
 
 echo Archive maintenance started at $(date +%X)
+TS=0
 
 NOTICE="$ftpdir/Archive_Maintenance_In_Progress"
 LOCKCU="$lockdir/daily.lock"
@@ -37,36 +38,43 @@ pg_dump projectb > /org/ftp.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 
 ################################################################################
 
-update-bugdoctxt
-update-mirrorlists
-update-mailingliststxt
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+cd $configdir
+$scriptsdir/update-bugdoctxt
+$scriptsdir/update-mirrorlists
+$scriptsdir/update-mailingliststxt
 
 ################################################################################
 
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
 lockfile $LOCKAC
 cd $accepted
 rm -f REPORT
-kelly -pa *.changes | tee REPORT | \
+dak process-unchecked -pa *.changes | tee REPORT | \
      mail -s "Install for $(date +%D)" ftpmaster@ftp-master.debian.org
 chgrp debadmin REPORT
 chmod 664 REPORT
 
-cd $masterdir
-cindy
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
+dak check-overrides
 rm -f $LOCKAC
 
 symlinks -d -r $ftpdir
 
-cd $masterdir
-jenna
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
+dak make-suite-file-list
+
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
 
 # Update fingerprints
-# [JT - disabled, emilie currently can ask questions]
-#emilie
+# [JT - disabled, dak import-ldap-fingerprints currently can ask questions]
+#dak import-ldap-fingerprints
 
 # Generate override files
 cd $overridedir
-denise
+dak make-overrides
 
 # Update task overrides for testing and unstable
 # [JT 2004-02-04 disabled; copying in by hand for now]
@@ -78,32 +86,42 @@ rm -f override.potato.all3 override.sid.all3
 for i in main contrib non-free; do cat override.potato.$i >> override.potato.all3; done
 for i in main contrib non-free main.debian-installer; do cat override.sid.$i >> override.sid.all3; done
 
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
 # Generate Packages and Sources files
-cd $masterdir
+cd $configdir
 apt-ftparchive generate apt.conf
 # Generate *.diff/ incremental updates
-tiffani
+dak generate-index-diffs
 # Generate Release files
-ziyi
+dak generate-releases
+
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
 
 # Clean out old packages
-rhona
-shania
+dak clean-suites
+dak clean-queues
+
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
 
 # Needs to be rebuilt, as files have moved.  Due to unaccepts, we need to
 # update this before wanna-build is updated.
 psql projectb -A -t -q -c "SELECT filename FROM queue_build WHERE suite = 5 AND queue = 0 AND in_queue = true AND filename ~ 'd(sc|eb)$'" > $dbdir/dists/unstable_accepted.list
 apt-ftparchive generate apt.conf.buildd
 
-mkmaintainers
-copyoverrides
-mklslar
-mkchecksums
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
+cd $scriptsdir
+./mkmaintainers
+./copyoverrides
+./mklslar
+./mkfilesindices
+./mkchecksums
 #
 # Fetch bugs information before unchecked processing is allowed again.
 /org/ftp.debian.org/testing/britney bugs
 rm -f $NOTICE
-sudo -u archvsync /home/archvsync/pushmerkel
+ssh buildd@buildd /org/wanna-build/trigger.daily
 
 rm -f $LOCKCU
 echo Archive maintenance finished at $(date +%X)
@@ -117,31 +135,41 @@ pg_dump projectb > $POSTDUMP
 
 ################################################################################
 
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
 # Vacuum the database
 echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE:  Skipping.*only table owner can VACUUM it$"
 
 ################################################################################
 
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
 # Send a report on NEW/BYHAND packages
-helena | mail -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
+dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
 # and one on crufty packages
-rene | tee $webdir/rene-daily.txt | mail -e -s "rene run for $(date +%D)" ftpmaster@ftp-master.debian.org
+dak cruft-report | tee $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org
 
 ################################################################################
 
-# Run billie
+# Run mirror-split
 
-#time billie
+#time dak mirror-split
 
 ################################################################################
 
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
 ulimit -m 90000 -d 90000 -s 10000 -v 90000
 
 run-parts --report /org/ftp.debian.org/scripts/distmnt
 
 echo Daily cron scripts successful.
-# Stats pr0n
 
-cd $masterdir
-update-ftpstats $base/log/* > $base/misc/ftpstats.data
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
+# Stats pr0n
+cd $configdir
+$scriptsdir/update-ftpstats $base/log/* > $base/misc/ftpstats.data
 R --slave --vanilla < $base/misc/ftpstats.R
+
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)