X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.daily;h=9417a8569e8495a778582637e5cc20e8cf0bc9e9;hb=1271e98ab531ba104007fb8b96931d95d61061ab;hp=059de3744529ee0a9e1143c2ec0bbf0af4eb190c;hpb=205d7ee9627d28d924fb6b8765de950f46acdb2e;p=dak.git

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 059de374..9417a856 100755
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -3,9 +3,12 @@
 # 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
 
+LOCKFILE="$lockdir/unchecked.lock"
+
 ################################################################################
 
 # Fix overrides
@@ -14,64 +17,67 @@ rsync --delete -r --include=override\* --exclude=\* --password-file /srv/securit
 
 cd $overridedir
 for file in override*.gz; do
-	zcat $file > $(basename $file .gz)
+    zcat -- "$file" > "${file%.gz}"
 done
-find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm
+find . -maxdepth 1 -mindepth 1 -type l -delete
 
-for suite in $suites; do
+for suite in oldstable stable testing; do
     case $suite in
-		oldstable) override_suite=etch;;
-		stable) override_suite=lenny;;
-		testing) override_suite=squeeze;;
-		*) echo "Unknown suite type ($suite)"; exit 1;;
+        oldstable) override_suite=wheezy  ;;
+        stable)    override_suite=jessie  ;;
+        testing)   override_suite=stretch ;;
+        *) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
-		for override_type in $override_types; do
-			case $override_type in
-				deb) type="" ;;
-				dsc) type=".src" ;;
-				udeb) type=".debian-installer" ;;
-			esac
-
-			if [ "$override_type" = "udeb" ]; then
-				if [ ! "$component" = "main" ]; then
-					continue
-				fi
-			fi
-			zcat override.$override_suite.$component$type.gz | dak control-overrides -q -a -t $override_type -s $suite -c updates/$component
-		done
-    done
-done
+        for override_type in $override_types; do
+            case $override_type in
+                deb) type="" ;;
+                dsc) type=".src" ;;
+                udeb) type=".debian-installer" ;;
+            esac
 
-# Generate .all3 overides for the buildd support
-for dist in etch lenny squeeze; do
-    rm -f override.$dist.all3
-    components="main contrib non-free";
-    if [ -f override.$dist.main.debian-installer.gz ]; then
-		components="$components main.debian-installer"
-    fi
-    for component in $components; do
-		zcat override.$dist.$component.gz >> override.$dist.all3
-        if [ -e "override.$dist.$component.src.gz" ]; then
-			zcat override.$dist.$component.src.gz >> override.$dist.all3.src
-		fi
+            if [ "$override_type" = "udeb" ]; then
+                if [ ! "$component" = "main" ]; then
+                    continue
+                fi
+            fi
+
+            OFILE="override.$override_suite.$component$type.gz"
+            if [ -r "$OFILE" ]; then
+                zcat "$OFILE" | dak control-overrides -q -a -t $override_type -s $suite -c updates/$component
+            fi
+        done
     done
 done
 
 ################################################################################
 
-cd $masterdir
-dak clean-queues
+cd $configdir
+dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg
+
+cleanup() {
+    rm -f "$LOCKFILE"
+}
+
+if ! lockfile -r100 "$LOCKFILE"; then
+    echo "Could not lock $LOCKFILE." >&2
+    exit 1
+fi
+trap cleanup EXIT
+
+dak clean-queues -i ${unchecked}
+dak clean-queues -i $disembargo
 dak clean-suites
-apt-ftparchive -q clean apt.conf
-apt-ftparchive -q clean apt.conf.buildd
+
+cleanup
+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}"
+
+find "${base}/dak-backup" -mtime +30 \! -name '.nobackup' -delete
 
 ################################################################################