amber component mapping, remove useless natalie section, suite/component changes...

diff --git a/katie.conf-security b/katie.conf-security
index c75d15d3a86871b2244b829a5c4484b1648d3a6b..9bef3bce2f93342f2e3a53a476da2c640ea6a6fd 100644 (file)
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -23,13 +23,15 @@ Dinstall
    BXANotify "false";
    AcceptedAutoBuildSuites
    {
-     potato;
-     woody;
+     stable;
+     testing;
    };
    SecurityAcceptedAutoBuild "true";     
-   DefaultSuite "Woody";
+   DefaultSuite "Testing";
+   SuiteSuffix "updates";
    OverrideMaintainer "katie@security.debian.org";
    StableDislocationSupport "true";
+   LegacyStableHasNoSections "true";
 };
 
 Julia
@@ -48,18 +50,6 @@ Shania
  MorgueSubDir "shania";
 };
 
-Natalie
-{
-  Options
-  {
-    Component "main";
-    Suite "unstable";
-    Type "deb";
-   };
-
- ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
-};
-
 Melanie
 {
   Options
@@ -87,8 +77,15 @@ Rhona
 
 Amber
 {
-  UploadHost "ftp-master.debian.org";
-  UploadDir "/pub/UploadQueue";
+  ComponentMappings
+  {
+    main "ftp-master.debian.org:/pub/UploadQueue";
+    contrib "ftp-master.debian.org:/pub/UploadQueue";
+    non-free "ftp-master.debian.org:/pub/UploadQueue";
+    non-US/main "non-us.debian.org:/pub/UploadQueue";
+    non-US/contrib "non-us.debian.org:/pub/UploadQueue";
+    non-US/non-free "non-us.debian.org:/pub/UploadQueue";
+  };
 };
 
 Suite
@@ -96,13 +93,13 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by charisma (highest wins).
 
-  Potato
+  Stable
   {
        Components 
        {
-         main;
-         contrib;
-         non-free;
+         updates/main;
+         updates/contrib;
+         updates/non-free;
        };
        Architectures 
        {
@@ -120,18 +117,18 @@ Suite
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian 2.2 Security Updates";
-       CodeName "potato/updates";
+       CodeName "potato";
        OverrideCodeName "potato";
        CopyKatie "/org/security.debian.org/queue/done/";
   };
 
-  Woody
+  Testing
   {
        Components 
        {
-         main;
-         contrib;
-         non-free;
+         updates/main;
+         updates/contrib;
+         updates/non-free;
        };
        Architectures 
        {
@@ -154,7 +151,7 @@ Suite
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian 3.0 Security Updates";
-       CodeName "woody/updates";
+       CodeName "woody";
        OverrideCodeName "woody";
        CopyKatie "/org/security.debian.org/queue/done/";
   };
@@ -163,8 +160,8 @@ Suite
 
 SuiteMappings
 {
- "map stable-security potato";
- "map testing-security woody";
+ "silent-map stable-security stable";
+ "silent-map testing-security testing";
 };
 
 Dir
@@ -236,19 +233,19 @@ Archive
 Component
 {
 
-  main
+  updates/main
   {
-       Description "Main";
+       Description "Main (updates)";
        MeetsDFSG "true";
   };
 
-  contrib
+  updates/contrib
   {
-       Description "Contrib";
+       Description "Contrib (updates)";
        MeetsDFSG "true";
   };
 
-  non-free
+  updates/non-free
   {
        Description "Software that fails to meet the DFSG";
        MeetsDFSG "false";
@@ -256,6 +253,16 @@ Component
 
 };
 
+ComponentMappings
+{
+ "main updates/main";
+ "contrib updates/contrib";
+ "non-free updates/non-free";
+ "non-US/main updates/main";
+ "non-US/contrib updates/contrib";
+ "non-US/non-free updates/non-free";
+};
+
 Section
 {
   admin;
@@ -313,7 +320,7 @@ Location
       Archive "security";
       Suites 
        {
-         Potato;
+         Stable;
         };
       Type "legacy";
     };