dak update-db: fixes to make it work on a fresh install

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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index fb219e5e52f0d46acce7a0e1a50d3731e56da675..6035bf01e109b9b1286fbe810c0fe4e304180fed 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -31,10 +31,9 @@ Dinstall
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "oldstable";
+   DefaultSuite "stable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
-   StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
@@ -112,7 +111,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  Oldstable
+  OldStable
   {
        Components 
        {
@@ -120,30 +119,14 @@ Suite
          updates/contrib;
          updates/non-free;
        };
-       Architectures 
-       {
-         source;  
-         all;
-         alpha;
-         amd64; 
-         arm;
-         hppa;
-         i386;
-         ia64;
-         m68k;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "dak@security.debian.org";
-       Version "3.1";
+       Version "";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian 3.1 Security Updates";
-       CodeName "sarge";
-       OverrideCodeName "sarge";
+       Description "Debian 4.0 Security Updates";
+       ValidTime 864000; // 10 days
+       CodeName "etch";
+       OverrideCodeName "etch";
        CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
@@ -155,74 +138,45 @@ Suite
          updates/contrib;
          updates/non-free;
        };
-       Architectures 
-       {
-         source;  
-         all;
-         amd64; 
-         alpha; 
-         arm;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "dak@security.debian.org";
        Version "";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian 4.0 Security Updates";
-       CodeName "etch";
-       OverrideCodeName "etch";
+       Description "Debian 5.0 Security Updates";
+       ValidTime 864000; // 10 days
+       CodeName "lenny";
+       OverrideCodeName "lenny";
        CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
   Testing
   {
-       Components 
+       Components
        {
          updates/main;
          updates/contrib;
          updates/non-free;
        };
-       Architectures 
-       {
-         source;  
-         all;
-         amd64; 
-         alpha; 
-         arm;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
        Announce "dak@security.debian.org";
        Version "";
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian testing Security Updates";
-       CodeName "lenny";
-       OverrideCodeName "lenny";
+       ValidTime 864000; // 10 days
+       CodeName "squeeze";
+       OverrideCodeName "squeeze";
        CopyDotDak "/org/security.debian.org/queue/done/";
   };
 };
 
 SuiteMappings
 {
-  "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
+ "silent-map oldstable-security oldstable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
-  "silent-map etch-secure stable";
+  "silent-map etch-secure oldstable";
+  "silent-map lenny-secure stable";
   "silent-map testing-security testing";
 };
 
@@ -241,6 +195,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/";
@@ -251,6 +206,7 @@ Dir
     Reject "/org/security.debian.org/queue/reject/";
     Unchecked "/org/security.debian.org/queue/unchecked/";
     ProposedUpdates "/does/not/exist/"; // XXX fixme
+    OldProposedUpdates "/does/not/exist/"; // XXX fixme
 
     Embargoed "/org/security.debian.org/queue/embargoed/";
     Unembargoed "/org/security.debian.org/queue/unembargoed/";
@@ -274,9 +230,9 @@ Architectures
   alpha "DEC Alpha";
   hppa "HP PA RISC";
   arm "ARM";
+  armel "ARM EABI";
   i386 "Intel ia32";
   ia64 "Intel ia64";
-  m68k "Motorola Mc680x0";
   mips "MIPS (Big Endian)";
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";
@@ -389,18 +345,12 @@ OverrideType
 
 Location
 {
-  /org/security.debian.org/ftp/dists/
-    {
-      Archive "security";
-      Type "legacy";
-    };
-
   /org/security.debian.org/ftp/pool/
     {
       Archive "security";
       Suites 
        {
-         Oldstable;
+         OldStable;
          Stable;
          Testing;
         };