X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-security;h=384246c82d6f0d015f5bc32d6fd75719b31d94c2;hb=b981d2124dad87cd181b5218cc0cf7764298b896;hp=c75d15d3a86871b2244b829a5c4484b1648d3a6b;hpb=2c0b25e493964a57357cd76edf251077079a7f34;p=dak.git

diff --git a/katie.conf-security b/katie.conf-security
index c75d15d3..384246c8 100644
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -23,13 +23,16 @@ Dinstall
    BXANotify "false";
    AcceptedAutoBuildSuites
    {
-     potato;
-     woody;
+     oldstable;
+     stable;
+     testing;
    };
    SecurityAcceptedAutoBuild "true";     
-   DefaultSuite "Woody";
+   DefaultSuite "Testing";
+   SuiteSuffix "updates";
    OverrideMaintainer "katie@security.debian.org";
-   StableDislocationSupport "true";
+   StableDislocationSupport "false";
+   LegacyStableHasNoSections "false";
 };
 
 Julia
@@ -48,18 +51,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
@@ -68,7 +59,7 @@ Melanie
    };
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-   LogFile "/org/security.debian.org/web/removals.txt";
+   LogFile "/org/security.debian.org/katie-log/removals.txt";
 };
 
 Neve
@@ -87,8 +78,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 +94,13 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by charisma (highest wins).
 
-  Potato
+  OldStable
   {
 	Components 
 	{
-	  main;
-	  contrib;
-	  non-free;
+	  updates/main;
+	  updates/contrib;
+	  updates/non-free;
 	};
 	Architectures 
 	{
@@ -120,18 +118,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
+  Stable
   {
 	Components 
 	{
-	  main;
-	  contrib;
-	  non-free;
+	  updates/main;
+	  updates/contrib;
+	  updates/non-free;
 	};
 	Architectures 
 	{
@@ -154,17 +152,54 @@ 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/";
   };
 
+  Testing
+  {
+	Components 
+	{
+	  updates/main;
+	  updates/contrib;
+	  updates/non-free;
+	};
+	Architectures 
+	{
+	  source;  
+	  all;
+	  alpha; 
+	  arm;
+	  hppa;
+	  i386;
+	  ia64;
+	  m68k;
+	  mips;
+	  mipsel;
+	  powerpc;
+	  s390;
+	  sparc;
+	};
+	Announce "katie@security.debian.org";
+	Version "x.y";
+	Origin "Debian";
+	Label "Debian-Security";
+	Description "Debian x.y Security Updates";
+	CodeName "sarge";
+	OverrideCodeName "sarge";
+	CopyKatie "/org/security.debian.org/queue/done/";
+  };
+
 };
 
 SuiteMappings
 {
- "map stable-security potato";
- "map testing-security woody";
+ "silent-map oldstable-security oldstable";
+ "silent-map stable-security stable";
+ // JT - FIXME, hackorama
+ "silent-map testing-security stable";
+ //"silent-map testing-security testing";
 };
 
 Dir
@@ -209,12 +244,12 @@ Architectures
   all "Architecture Independent";
   alpha "DEC Alpha";
   hppa "HP PA RISC";
-  arm "Arm";
+  arm "ARM";
   i386 "Intel ia32";
   ia64 "Intel ia64";
   m68k "Motorola Mc680x0";
-  mips "SGI MIPS";
-  mipsel "SGI MIPS (Little Endian)";
+  mips "MIPS (Big Endian)";
+  mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";
   s390 "IBM S/390";
   sparc "Sun SPARC/UltraSPARC";
@@ -236,19 +271,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 +291,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 +358,8 @@ Location
       Archive "security";
       Suites 
 	{
-	  Potato;
+	  Stable;
+	  Testing;
         };
       Type "legacy";
     };