X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.weekly;h=45677cd97bb854b790a6d1f7cf94f2e9434dd905;hb=0872b2e0b78670c91fd2bf0bda52e5761e079820;hp=4baaf46c3a7c9e482ecfce074b1d1298111784fd;hpb=6a4cddfbe864e563e671fe5dabf5600c4783af5c;p=dak.git

diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 4baaf46c..45677cd9 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/*
@@ -51,7 +52,10 @@ apt-ftparchive -q clean apt.conf.buildd
 
 # Update wanna-build dump
 echo "Update wanna-build database dump"
-/org/ftp.debian.org/scripts/nfu/get-w-b-db
+$base/dak/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