X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.weekly;h=1ff6b2cd8c8e4e73cdbb7a2de16b5345643c00da;hb=a230888892aa3638bd2f51446a788659c182c2eb;hp=9a4c56f141f57d466652ca462199d56feb1420f2;hpb=8e475b502ed8cc0696984ac7cb7aad91a0cfca27;p=dak.git

diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 9a4c56f1..1ff6b2cd 100755
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -4,7 +4,11 @@
 
 set -e
 set -u
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 # Start logging
@@ -31,12 +35,9 @@ fi
 echo "Splitting queue/done"
 dak split-done > /dev/null
 
-# Vacuum the database
-echo "VACUUM; VACUUM ANALYZE;" | psql --no-psqlrc projectb 2>&1 | grep -v "^NOTICE:  Skipping.*only table owner can VACUUM it$"
-
 # Do git cleanup stuff
 echo "Doing git stuff"
-cd /org/ftp.debian.org/git/dak.git
+cd /srv/ftp.debian.org/git/dak.git
 git gc --prune
 git update-server-info
 # now workaround a git bug not honoring the setup in logs/*
@@ -49,9 +50,8 @@ echo "Cleanup apt-ftparchive's database"
 apt-ftparchive -q clean apt.conf
 apt-ftparchive -q clean apt.conf.buildd
 
-# Update wanna-build dump
-echo "Update wanan-build database dump"
-/org/ftp.debian.org/scripts/nfu/get-w-b-db
+echo "Fixing symlinks in $ftpdir"
+symlinks -d -r $ftpdir
 
 echo "Finally, all is done, compressing logfile"
 exec > /dev/null 2>&1