X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.daily;h=3476d7db556f3e115d2171c89352b714ec26bdbc;hb=e0b278fa0638b0da6919159a33fe9cd5ce87a819;hp=3c34d769ec2bea6d1abccf73910ef2aff5aae791;hpb=e13fd3c48245d48b0335649d294aacaee666bab5;p=dak.git

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 3c34d769..3476d7db 100755
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -3,6 +3,7 @@
 # Executed daily via cron, out of dak's crontab.
 
 set -e
+set -o pipefail
 export SCRIPTVARS=/srv/security-master.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 
@@ -20,10 +21,11 @@ for file in override*.gz; do
 done
 find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm
 
-for suite in $suites; do
+for suite in stable testing; do
     case $suite in
-        stable) override_suite=squeeze;;
-        testing) override_suite=wheezy;;
+        oldstable) override_suite=squeeze;;
+        stable) override_suite=wheezy;;
+        testing) override_suite=jessie;;
         *) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
@@ -49,7 +51,7 @@ for suite in $suites; do
 done
 
 # Generate .all3 overides for the buildd support
-for dist in squeeze wheezy; do
+for dist in squeeze wheezy jessie; do
     rm -f override.$dist.all3
     components="main contrib non-free";
     if [ -f override.$dist.main.debian-installer.gz ]; then
@@ -78,7 +80,7 @@ if ! lockfile -r100 "$LOCKFILE"; then
 fi
 trap cleanup EXIT
 
-dak clean-queues
+dak clean-queues -i ${unchecked}
 dak clean-queues -i $disembargo
 dak clean-suites
 
@@ -87,13 +89,10 @@ trap - EXIT
 
 symlinks -d -r $ftpdir
 
-pg_dump obscurity > /org/security-master.debian.org/dak-backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
-find -maxdepth 1 -mindepth 1 -type f -name 'dump_*' \! -name '*.bz2' \! -name '*.gz' -mmin +720 |
-while read dumpname; do
-    bzip2 -9fv "$dumpname"
-done
+pg_file="${base}/dak-backup/dump_$(date +%Y.%m.%d-%H:%M:%S)"
+pg_dump obscurity > "${pg_file}"
+nice xz -9 "${pg_file}"
 
-#apt-ftparchive -q clean apt.conf
-#apt-ftparchive -q clean apt.conf.buildd
+find "${base}/dak-backup" -mtime +30 \! -name '.nobackup' -delete
 
 ################################################################################