Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

[dak.git] / config / debian / cron.weekly

diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 99d16359365f196ce82c3325b3f46bbd8d987425..06d3f90a93d6e3a54e81a2afd6f571b93127237a 100755 (executable)
--- 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,14 +35,17 @@ 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$"
-
-# Clean up apt-ftparchive's databases
-cd $configdir
-echo "Cleanup apt-ftparchive's database"
-apt-ftparchive -q clean apt.conf
-apt-ftparchive -q clean apt.conf.buildd
+# Do git cleanup stuff
+echo "Doing git stuff"
+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/*
+# (fix in development, but until it reached backports.org.......)
+chmod -R g+w logs/
+
+echo "Fixing symlinks in $ftpdir"
+symlinks -d -r $ftpdir
 
 echo "Finally, all is done, compressing logfile"
 exec > /dev/null 2>&1