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

diff --git a/katie.conf-security b/katie.conf-security
index 9bef3bce..aa8c190e 100644
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -23,6 +23,7 @@ Dinstall
    BXANotify "false";
    AcceptedAutoBuildSuites
    {
+     oldstable;
      stable;
      testing;
    };
@@ -30,15 +31,25 @@ Dinstall
    DefaultSuite "Testing";
    SuiteSuffix "updates";
    OverrideMaintainer "katie@security.debian.org";
-   StableDislocationSupport "true";
-   LegacyStableHasNoSections "true";
+   StableDislocationSupport "false";
+   LegacyStableHasNoSections "false";
 };
 
 Julia
 {
   ValidGID "800";
-  // Comma seperated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,katie";
+  // Comma separated list of users who are in Postgres but not the passwd file
+  KnownPostgres "postgres,katie,www-data,udmsearch";
+};
+
+Helena
+{
+  Directories
+  {
+    byhand;
+    new;
+    accepted;
+  };
 };
 
 Shania
@@ -46,7 +57,7 @@ Shania
   Options
   {
     Days 14;
-   };
+  };
  MorgueSubDir "shania";
 };
 
@@ -55,10 +66,10 @@ Melanie
   Options
   {
     Suite "unstable";
-   };
+  };
 
-   MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-   LogFile "/org/security.debian.org/web/removals.txt";
+  MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
+  LogFile "/org/security.debian.org/katie-log/removals.txt";
 };
 
 Neve
@@ -93,7 +104,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by charisma (highest wins).
 
-  Stable
+  OldStable
   {
 	Components 
 	{
@@ -122,7 +133,7 @@ Suite
 	CopyKatie "/org/security.debian.org/queue/done/";
   };
 
-  Testing
+  Stable
   {
 	Components 
 	{
@@ -156,12 +167,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 +254,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";
@@ -273,10 +321,14 @@ Section
   doc;
   editors;
   electronics;
+  embedded;
   games;
+  gnome;
   graphics;
   hamradio;
   interpreters;
+  kde;
+  libdevel;
   libs;
   mail;
   math;
@@ -285,6 +337,8 @@ Section
   news;
   oldlibs;
   otherosfs;
+  perl;
+  python;
   science;
   shells;
   sound;
@@ -318,16 +372,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";
     };
 };