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

diff --git a/katie.conf-security b/katie.conf-security
index b6ecef64..aa8c190e 100644
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -21,37 +21,44 @@ Dinstall
    CloseBugs "false";
    OverrideDisparityCheck "false";
    BXANotify "false";
-   SpecialAcceptedAutoBuild "true";
-   DefaultSuite "Woody";
+   AcceptedAutoBuildSuites
+   {
+     oldstable;
+     stable;
+     testing;
+   };
+   SecurityAcceptedAutoBuild "true";     
+   DefaultSuite "Testing";
+   SuiteSuffix "updates";
    OverrideMaintainer "katie@security.debian.org";
+   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";
 };
 
-Shania
+Helena
 {
-  Options
+  Directories
   {
-    Days 14;
-   };
- MorgueSubDir "shania";
+    byhand;
+    new;
+    accepted;
+  };
 };
 
-Natalie
+Shania
 {
   Options
   {
-    Component "main";
-    Suite "unstable";
-    Type "deb";
-   };
-
- ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
+    Days 14;
+  };
+ MorgueSubDir "shania";
 };
 
 Melanie
@@ -59,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
@@ -81,8 +88,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 +104,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 
 	{
@@ -114,18 +128,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 
 	{
@@ -148,17 +162,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-sec potato";
- "map testing-sec 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
@@ -174,6 +225,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/";
@@ -202,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";
@@ -229,19 +281,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 +301,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;
@@ -259,10 +321,14 @@ Section
   doc;
   editors;
   electronics;
+  embedded;
   games;
+  gnome;
   graphics;
   hamradio;
   interpreters;
+  kde;
+  libdevel;
   libs;
   mail;
   math;
@@ -271,6 +337,8 @@ Section
   news;
   oldlibs;
   otherosfs;
+  perl;
+  python;
   science;
   shells;
   sound;
@@ -304,16 +372,18 @@ Location
   /org/security.debian.org/ftp/dists/
     {
       Archive "security";
-      Suites 
-	{
-	  Potato;
-        };
       Type "legacy";
     };
 
   /org/security.debian.org/ftp/pool/
     {
       Archive "security";
+      Suites 
+	{
+	  OldStable;
+	  Stable;
+	  Testing;
+        };
       Type "pool";
     };
 };