Merge branch 'master' into dbtests

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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 21e1768995ae4d4cc5a1ebfc9aab56e7fb25c052..32dc6aad5a8c3b5990501aaf24fd26012d4e8941 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -150,7 +150,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  Stable
+  OldStable
   {
        Components 
        {
@@ -169,7 +169,7 @@ Suite
        CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
 
-  Testing
+  Stable
   {
        Components
        {
@@ -181,12 +181,31 @@ Suite
        Version "";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian testing Security Updates";
+       Description "Debian 6.0 Security Updates";
        ValidTime 864000; // 10 days
        CodeName "squeeze";
        OverrideCodeName "squeeze";
        CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
+
+  Testing
+  {
+       Components
+       {
+         updates/main;
+         updates/contrib;
+         updates/non-free;
+       };
+       Announce "dak@security.debian.org";
+       Version "";
+       Origin "Debian";
+       Label "Debian-Security";
+       Description "Debian testing Security Updates";
+       ValidTime 864000; // 10 days
+       CodeName "wheezy";
+       OverrideCodeName "wheezy";
+       CopyDotDak "/srv/security-master.debian.org/queue/done/";
+  };
 };
 
 SuiteMappings
@@ -198,6 +217,9 @@ SuiteMappings
   "silent-map etch-secure oldstable";
   "silent-map lenny-secure stable";
   "silent-map testing-security testing";
+  "silent-map lenny-security oldstable";
+  "silent-map squeeze-security stable";
+  "silent-map wheezy-security testing";
 };
 
 Dir
@@ -227,8 +249,8 @@ Dir
     Unchecked "/srv/security-master.debian.org/queue/unchecked/";
     Newstage "/srv/security-master.debian.org/queue/newstage/";
 
-    ProposedUpdates "/does/not/exist/"; // XXX fixme
-    OldProposedUpdates "/does/not/exist/"; // XXX fixme
+    ProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme
+    OldProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme
 
     Embargoed "/srv/security-master.debian.org/queue/embargoed/";
     Unembargoed "/srv/security-master.debian.org/queue/unembargoed/";