Merge branch 'master' of /org/wanna-build/

[wannabuild.git] / trigger.daily

diff --git a/trigger.daily b/trigger.daily
index 184bd681b5507fb28aa0c7d9be73a4956b89ba3a..3f9dc1069ac4f472f509ebed85cc7af1e25e8567 100755 (executable)
--- a/trigger.daily
+++ b/trigger.daily
@@ -39,7 +39,7 @@ cleanup() {
 trap cleanup 0
 
 echo Dumping wanna-build databases...
-pg_dump service=wanna-build-privileged | bzip2 > /org/wanna-build/dumps/dump_pre_$(date +%Y.%m.%d-%H:%M:%S).bz2
+sudo -u postgres /usr/bin/pg_dumpall --cluster 8.4/wanna-build | bzip2 > /org/wanna-build/dumps/dump_pre_$(date +%Y.%m.%d-%H:%M:%S).bz2
 
 echo Updating wanna-build databases...
 umask 027
@@ -209,9 +209,6 @@ for a in $ALL_ARCHES ; do
                mv Packages.$d.$a Packages.$d.$a-old
                mv quinn-$d.$a quinn-$d.$a-old
        done
-       if [ "$DAY" = "0" ]; then
-               savelog -p -c 128 /srv/wanna-build/db/$a/transactions.log
-       fi
 done
 umask 022
 for d in $DISTS; do
@@ -220,7 +217,9 @@ done
 
 echo "merge ended: `date`"
 
-pg_dump service=wanna-build-privileged | bzip2 > /org/wanna-build/dumps/dump_post_$(date +%Y.%m.%d-%H:%M:%S).bz2
+sudo -u postgres /usr/bin/pg_dumpall --cluster 8.4/wanna-build | bzip2 > /org/wanna-build/dumps/dump_post_$(date +%Y.%m.%d-%H:%M:%S).bz2
+
+(cd /org/wanna-build/dumps && /org/wanna-build/expire_dumps -d . -f "dump_*")
 
 #
 # Only update stats if it's been at least 20h since the last time.