X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.daily;h=48f746879226bf780f9706bf00875d55a280d160;hb=330833cdf958e43962e208f8021e0e44f1fc100c;hp=215bdb590542b5295413b9b7b2d3330d84a3eb00;hpb=07cb20bec23644707ec7ef67e8dec5cb06aa6e83;p=dak.git

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 215bdb59..48f74687 100755
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -154,7 +154,7 @@ pg_dump projectb > $POSTDUMP
 
 ################################################################################
 
-#TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
+TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
 
 # Vacuum the database
 # (JJ, 20-04-2008) disabled, as we have autovacuum set to on in postgres.
@@ -163,6 +163,9 @@ pg_dump projectb > $POSTDUMP
 # whose purpose is to automate the execution of VACUUM and ANALYZE  commands."
 # echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE:  Skipping.*only table owner can VACUUM it$"
 
+echo "Expiring old database dumps..."
+(cd $base/backup; $scriptsdir/expire_dumps -d . -p -f "dump_*")
+
 ################################################################################
 
 TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
@@ -176,6 +179,9 @@ $scriptsdir/dm-monitor >$webdir/dm-uploaders.html
 
 ################################################################################
 
+# Push katie@merkel so it syncs the projectb there. Returns immediately, the sync runs detached
+ssh -2 -i ~/.ssh/push_merkel_projectb katie@merkel.debian.org sleep 1
+
 # Run mirror-split
 
 #time dak mirror-split
@@ -206,10 +212,10 @@ apt-ftparchive -q clean apt.conf
 
 TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
 
-# Compress psql backups older than a month, but no more than 20 of them
+# Compress psql backups older than a week, but no more than 20 of them
 
 (cd $base/backup/
- find -maxdepth 1 -mindepth 1 -type f -name 'dump_*' \! -name '*.bz2' \! -name '*.gz' -mtime +30 | 
+ find -maxdepth 1 -mindepth 1 -type f -name 'dump_*' \! -name '*.bz2' \! -name '*.gz' -mtime +7 | 
    sort | head -n20 | while read dumpname; do
      echo "Compressing $dumpname"
      bzip2 -9 "$dumpname"