Merge commit 'ftpmaster/master' into psycopg2

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

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 6c3e091181766cf34ebf06078025e9628ceba373..c5bcbb055c7d7230fcaf570be9f650d4e284fce7 100755 (executable)
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -50,26 +50,14 @@ done
 
 if [ ! -z "$dists" ]; then
        # setup ssh master process
-       ssh buildd@buildd -S $SSH_SOCKET -MN 2> /dev/null &
+       ssh wbadm@buildd -S $SSH_SOCKET -MN 2> /dev/null &
        SSH_PID=$!
        while [ ! -S $SSH_SOCKET ]; do
                sleep 1
        done
        trap 'kill -TERM $SSH_PID' 0
        for d in $dists; do
-               archs=ARCHS_$d
-               ARCHS=${!archs}
-               cd /org/security.debian.org/buildd/$d
-               if [ "$d" != "oldstable" ]; then
-                       # disabled for oldstable-security by ajt 2008-01-01
-                       for a in $ARCHS; do
-                               quinn-diff -a /org/security.debian.org/buildd/Packages-arch-specific -A $a 2>/dev/null | ssh buildd@buildd -S $SSH_SOCKET wanna-build -d $d-security -b $a/build-db --merge-partial-quinn
-
-                               ssh buildd@buildd -S $SSH_SOCKET wanna-build -d $d-security -A $a -b $a/build-db --merge-packages < Packages
-                       done
-               else
-                       ssh buildd@bester.farm.ftbfs.de -i ~/.ssh/id_bester sleep 1
-               fi
+               ssh wbadm@buildd -S $SSH_SOCKET trigger.security $d
        done
 fi