X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-security;h=2f5a1ccfc7665df1f17737aa75943ac55f963fb8;hb=2d65382924e541681fbefcd8a453e0e0a00142e0;hp=b6ecef649a2819aa8d1540af025651a67b103dfa;hpb=5b1244957793ec103b80d2c5516e1744324806ea;p=dak.git

diff --git a/katie.conf-security b/katie.conf-security
index b6ecef64..2f5a1ccf 100644
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -21,9 +21,17 @@ Dinstall
    CloseBugs "false";
    OverrideDisparityCheck "false";
    BXANotify "false";
-   SpecialAcceptedAutoBuild "true";
-   DefaultSuite "Woody";
+   AcceptedAutoBuildSuites
+   {
+     stable;
+     testing;
+   };
+   SecurityAcceptedAutoBuild "true";     
+   DefaultSuite "Testing";
+   SuiteSuffix "updates";
    OverrideMaintainer "katie@security.debian.org";
+   StableDislocationSupport "true";
+   LegacyStableHasNoSections "true";
 };
 
 Julia
@@ -42,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
@@ -81,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
@@ -90,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 
 	{
@@ -114,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 
 	{
@@ -148,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/";
   };
@@ -157,8 +160,8 @@ Suite
 
 SuiteMappings
 {
- "map stable-sec potato";
- "map testing-sec woody";
+ "silent-map stable-security stable";
+ "silent-map testing-security testing";
 };
 
 Dir
@@ -174,6 +177,7 @@ Dir
   Morgue "/org/security.debian.org/morgue/";
   MorgueReject "reject";
   Override "/org/security.debian.org/scripts/override/";
+  AcceptedAutoBuild "/org/security.debian.org/buildd/";
   Queue
   {
     Root "/org/security.debian.org/queue/";
@@ -229,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";
@@ -249,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;
@@ -306,7 +320,8 @@ Location
       Archive "security";
       Suites 
 	{
-	  Potato;
+	  Stable;
+	  Testing;
         };
       Type "legacy";
     };