[???] various (aj?) changes

[dak.git] / config / debian-security / cron.daily

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
old mode 100644 (file)
new mode 100755 (executable)
index 32a4595..d8d2bd1
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -1,40 +1,27 @@
-#! /bin/sh
+#!/bin/sh
 #
-# Executed daily via cron, out of katie's crontab.
+# Executed daily via cron, out of dak's crontab.
 
 set -e
-export SCRIPTVARS=/org/security.debian.org/katie/vars-security
+export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 
 ################################################################################
 
 # Fix overrides
 
-rsync -ql ftp-master::indices/override\* $overridedir
+# disabled by ajt 2008-01-01: requires auth
+rsync --password-file /srv/non-us.debian.org/s3kr1t/rsync-password -ql security-master@ftp-master::indices/override\* $overridedir
 
 cd $overridedir
 find . -name override\*.gz -type f -maxdepth 1 -mindepth 1 | xargs gunzip -f
-find . -type l -maxdepth 1 -mindepth 1 | xargs rm
-
-rm -fr non-US
-mkdir non-US
-cd non-US
-rsync -ql non-us::indices/override\* .
-find . -name override\*.gz -type f -maxdepth 1 -mindepth 1 | xargs gunzip
-find . -type l -maxdepth 1 -mindepth 1 | xargs rm
-for i in *; do
-    if [ -f ../$i ]; then
-       cat $i >> ../$i;
-    fi;
-done
-cd ..
-rm -fr non-US
+find . -type l -maxdepth 1 -mindepth 1 | xargs --no-run-if-empty rm
 
 for suite in $suites; do
     case $suite in
-       oldstable) override_suite=woody;;
-       stable) override_suite=sarge;;
-       testing) override_suite=etch;;
+       oldstable) override_suite=sarge;;
+       stable) override_suite=etch;;
+       testing) override_suite=lenny;;
        *) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
@@ -47,26 +34,25 @@ for suite in $suites; do
            # XXX RUN AFUCKINGAWAY
            if [ "$override_type" = "udeb" ]; then
                if [ ! "$component" = "main" ]; then
-                continue;
+                continue
               fi
               if [ "$suite" = "unstable" ]; then
-                $masterdir/natalie -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
+                dak control-overrides -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
               fi
            else
-              $masterdir/natalie -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
+              # XXX removed 2007-08-16 ajt
+              #dak control-overrides -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
+              true
            fi
            case $suite in
              oldstable)
-               if [ ! "$override_type" = "udeb" ]; then
-                  $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sarge.$component$type
-                fi
-               $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+               dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
                ;;
              stable)
-               $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+               dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
                ;;
              testing)
-               $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+               dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
                ;;
              *) echo "Unknown suite type ($suite)"; exit 1;;
            esac
@@ -75,15 +61,18 @@ for suite in $suites; do
 done
 
 # Generate .all3 overides for the buildd support
-for dist in woody sarge etch; do
+for dist in sarge etch lenny; do
     rm -f override.$dist.all3
     components="main contrib non-free";
     if [ -f override.$dist.main.debian-installer ]; then
-       components="$components main.debian-installer";
+       components="$components main.debian-installer"
     fi
     for component in $components; do
-       cat override.$dist.$component >> override.$dist.all3;
-    done;
+       cat override.$dist.$component >> override.$dist.all3
+        if [ -e "override.$dist.$component.src" ]; then
+           cat override.$dist.$component.src >> override.$dist.all3.src
+       fi
+    done
 done
 
 ################################################################################
@@ -95,14 +84,14 @@ wget -qN http://buildd.debian.org/quinn-diff/Packages-arch-specific -O $base/bui
 ################################################################################
 
 cd $masterdir
-shania
-rhona
-apt-ftparchive -q clean apt.conf-security
-apt-ftparchive -q clean apt.conf.buildd-security
+dak clean-queues
+dak clean-suites
+apt-ftparchive -q clean apt.conf
+apt-ftparchive -q clean apt.conf.buildd
 
 symlinks -d -r $ftpdir
 
-pg_dump obscurity > /org/security.debian.org/katie-backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
+pg_dump obscurity > /org/security.debian.org/dak-backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 
 # Vacuum the database
 set +e