Merge commit 'dak-master/master'

[dak.git] / config / debian-security / dak.conf

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 8cff5ada66c5d0dab682735895c74dc2ac7b0cb3..ff74a599bf07cc5fed1f18f01b252b77b767ab34 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -33,7 +33,6 @@ Dinstall
    DefaultSuite "stable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
-   StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
@@ -140,6 +139,7 @@ Suite
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian 4.0 Security Updates";
+       ValidTime 864000; // 10 days
        CodeName "etch";
        OverrideCodeName "etch";
        CopyDotDak "/org/security.debian.org/queue/done/";
@@ -175,6 +175,7 @@ Suite
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian testing Security Updates";
+       ValidTime 864000; // 10 days
        CodeName "lenny";
        OverrideCodeName "lenny";
        CopyDotDak "/org/security.debian.org/queue/done/";
@@ -205,6 +206,7 @@ Dir
   MorgueReject "reject";
   Override "/org/security.debian.org/scripts/override/";
   QueueBuild "/org/security.debian.org/buildd/";
+  Upload "/srv/queued/UploadQueue/";
   Queue
   {
     Accepted "/org/security.debian.org/queue/accepted/";
@@ -242,7 +244,6 @@ Architectures
   armel "ARM EABI";
   i386 "Intel ia32";
   ia64 "Intel ia64";
-  m68k "Motorola Mc680x0";
   mips "MIPS (Big Endian)";
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";