X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-security;h=7d67b25c4c086c97994696ab590dac09889b0e83;hb=a84b28e207984eef311303959978741f776a425f;hp=9bef3bce2f93342f2e3a53a476da2c640ea6a6fd;hpb=9ee7979dca00c384753ce8e167b2234095140d6a;p=dak.git

diff --git a/katie.conf-security b/katie.conf-security
index 9bef3bce..7d67b25c 100644
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -23,6 +23,7 @@ Dinstall
    BXANotify "false";
    AcceptedAutoBuildSuites
    {
+     oldstable;
      stable;
      testing;
    };
@@ -30,8 +31,8 @@ Dinstall
    DefaultSuite "Testing";
    SuiteSuffix "updates";
    OverrideMaintainer "katie@security.debian.org";
-   StableDislocationSupport "true";
-   LegacyStableHasNoSections "true";
+   StableDislocationSupport "false";
+   LegacyStableHasNoSections "false";
 };
 
 Julia
@@ -58,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
@@ -93,7 +94,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by charisma (highest wins).
 
-  Stable
+  OldStable
   {
 	Components 
 	{
@@ -122,7 +123,7 @@ Suite
 	CopyKatie "/org/security.debian.org/queue/done/";
   };
 
-  Testing
+  Stable
   {
 	Components 
 	{
@@ -156,12 +157,49 @@ Suite
 	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
 {
+ "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
- "silent-map testing-security testing";
+ // JT - FIXME, hackorama
+ "silent-map testing-security stable";
+ //"silent-map testing-security testing";
 };
 
 Dir
@@ -206,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";
@@ -318,16 +356,18 @@ Location
   /org/security.debian.org/ftp/dists/
     {
       Archive "security";
-      Suites 
-	{
-	  Stable;
-        };
       Type "legacy";
     };
 
   /org/security.debian.org/ftp/pool/
     {
       Archive "security";
+      Suites 
+	{
+	  OldStable;
+	  Stable;
+	  Testing;
+        };
       Type "pool";
     };
 };