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 ff74a599bf07cc5fed1f18f01b252b77b767ab34..6035bf01e109b9b1286fbe810c0fe4e304180fed 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -25,6 +25,7 @@ Dinstall
    BXANotify "false";
    QueueBuildSuites
    {
+     oldstable;
      stable;
      testing;
    };
@@ -110,7 +111,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  Stable
+  OldStable
   {
        Components 
        {
@@ -118,22 +119,6 @@ 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";
@@ -145,7 +130,7 @@ Suite
        CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
-  Testing
+  Stable
   {
        Components 
        {
@@ -153,22 +138,24 @@ Suite
          updates/contrib;
          updates/non-free;
        };
-       Architectures 
+       Announce "dak@security.debian.org";
+       Version "";
+       Origin "Debian";
+       Label "Debian-Security";
+       Description "Debian 5.0 Security Updates";
+       ValidTime 864000; // 10 days
+       CodeName "lenny";
+       OverrideCodeName "lenny";
+       CopyDotDak "/org/security.debian.org/queue/done/";
+  };
+
+  Testing
+  {
+       Components
        {
-         source;  
-         all;
-         amd64; 
-         alpha; 
-         arm;
-         armel;
-         hppa;
-         i386;
-         ia64;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
+         updates/main;
+         updates/contrib;
+         updates/non-free;
        };
        Announce "dak@security.debian.org";
        Version "";
@@ -176,8 +163,8 @@ Suite
        Label "Debian-Security";
        Description "Debian testing Security Updates";
        ValidTime 864000; // 10 days
-       CodeName "lenny";
-       OverrideCodeName "lenny";
+       CodeName "squeeze";
+       OverrideCodeName "squeeze";
        CopyDotDak "/org/security.debian.org/queue/done/";
   };
 };
@@ -185,9 +172,11 @@ Suite
 SuiteMappings
 {
  "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";
 };
 
@@ -356,17 +345,12 @@ OverrideType
 
 Location
 {
-  /org/security.debian.org/ftp/dists/
-    {
-      Archive "security";
-      Type "legacy";
-    };
-
   /org/security.debian.org/ftp/pool/
     {
       Archive "security";
       Suites 
        {
+         OldStable;
          Stable;
          Testing;
         };