X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.daily;h=333f4e09edd9f68d01373630fb35520d0dc2f810;hb=6f984c8f09377f51ea631e9bbfcd9ab02a39f993;hp=9c24f911c9493018c11526e79f0bab0cf7dce8eb;hpb=17cec6a95a357324d0292155242310aed6757ebf;p=dak.git

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 9c24f911..333f4e09 100755
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -3,12 +3,13 @@
 # Executed daily via cron, out of dak's crontab.
 
 set -e
-export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/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"
@@ -33,33 +34,40 @@ EOF
 ################################################################################
 
 echo "Creating pre-daily-cron-job backup of projectb database..."
-pg_dump projectb > /org/ftp.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
+pg_dump projectb > $base/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
-dak process-unchecked -pa *.changes | tee REPORT | \
+dak process-accepted -pa *.changes | tee REPORT | \
      mail -s "Install for $(date +%D)" ftpmaster@ftp-master.debian.org
 chgrp debadmin REPORT
 chmod 664 REPORT
 
-cd $masterdir
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
 dak check-overrides
 rm -f $LOCKAC
 
 symlinks -d -r $ftpdir
 
-cd $masterdir
+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, dak import-ldap-fingerprints currently can ask questions]
 #dak import-ldap-fingerprints
@@ -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
 dak generate-index-diffs
 # Generate Release files
 dak generate-releases
 
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
 # Clean out old packages
 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
+$base/testing/britney allowdaklock bugs || true
 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)
@@ -111,17 +129,21 @@ echo Archive maintenance finished at $(date +%X)
 ################################################################################
 
 echo "Creating post-daily-cron-job backup of projectb database..."
-POSTDUMP=/org/ftp.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
+POSTDUMP=$base/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 pg_dump projectb > $POSTDUMP
-(cd /org/ftp.debian.org/backup; ln -sf $POSTDUMP current)
+(cd $base/backup; ln -sf $POSTDUMP current)
 
 ################################################################################
 
+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
 dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
 # and one on crufty packages
@@ -135,13 +157,19 @@ dak cruft-report | tee $webdir/cruft-report-daily.txt | mail -e -s "Debian archi
 
 ################################################################################
 
+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
+run-parts --report $base/scripts/distmnt
 
 echo Daily cron scripts successful.
 
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+
 # Stats pr0n
-cd $masterdir
-update-ftpstats $base/log/* > $base/misc/ftpstats.data
+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)