X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=1b81e3297ecc9020e567630d1781921b5dd7d333;hb=a9a4efc997ab32398a78367b1cc6bc5fd2e34678;hp=06511d79ef384782bcb92a74647144c62ad7a3f9;hpb=d282b550bd350fb493826d3a27f9dc92d4273162;p=dak.git

diff --git a/katie.conf b/katie.conf
index 06511d79..1b81e329 100644
--- a/katie.conf
+++ b/katie.conf
@@ -9,7 +9,6 @@ Dinstall
         Manual-Reject "";
         No-Action "";
         No-Lock "";
-        No-Version-Check "";
         No-Mail "";
         Override-Distribution "";
         Version "";
@@ -17,11 +16,16 @@ Dinstall
 
    PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+   SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SendmailCommand "/usr/sbin/sendmail -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
+   MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
+   MyDistribution "Debian"; // Used in emails
+   BugServer "bugs.debian.org";
    NewAckList "/org/ftp.debian.org/katie/log";
    LockFile "/org/ftp.debian.org/katie/lock";
+   Bcc "troup@auric.debian.org";
 
 };
 
@@ -41,6 +45,33 @@ Heidi
 
 };
 
+Catherine
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Limit "";
+    No-Action "";
+    Verbose "";
+    Version "";
+   };
+
+};
+
+Tea
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Version "";
+   };
+
+};
+
 Jenna
 {
 
@@ -106,7 +137,6 @@ Melanie
     Component "";
     Done "";
     No-Action "";
-    Orphan "";
     Partial "";
     Reason "";
     Source-Only "";
@@ -114,7 +144,7 @@ Melanie
    };
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-   LogFile "/home/troup/public_html/removals.txt";
+   LogFile "/org/ftp.debian.org/web/removals.txt";
 };
 
 Neve
@@ -148,25 +178,38 @@ Suite
   
   Experimental
   {
+	Components 
+	{
+	  main "";
+	  contrib "";
+	  non-free "";
+	};
 	Architectures 
 	{
-	  "source" "";  
+	  "source" ""; 
 	  "all" "";
 	  "alpha" ""; 
 	  "arm" "";
+	  "hppa" "";
+	  "hurd-i386" "";
 	  "i386" "";
+	  "ia64" "";
 	  "m68k" "";
+	  "mips" "";
+	  "mipsel" "";
 	  "powerpc" "";
+	  "s390" "";
+	  "sh" "";
 	  "sparc" "";
 	};
 	Announce "debian-devel-changes@lists.debian.org";
-	Version "xx";
 	Origin "Debian";
 	Description "Experimental packages - not released; use at your own risk.";
 	CodeName "experimental";
-	OverrideCodeName "experimental";
-	SingleOverrideFile "true";
+	OverrideCodeName "sid";
+	OverrideSuite "unstable";
 	Priority "0";
+        Tree "project/experimental";
   };
 
   Stable
@@ -219,6 +262,7 @@ Suite
 	Description "Proposed Updates for Debian 2.2r3 - Not Released";
 	CodeName "proposed-updates";
 	OverrideCodeName "potato";
+	OverrideSuite "stable";
 	Priority "2";
   };
 
@@ -241,10 +285,10 @@ Suite
 	  "powerpc" "";
 	  "sparc" "";
 	};
-	Version "2.3-testing";
 	Origin "Debian";
-	Description "Debian 2.3 Testing distribution - Not Released";
-	OverrideCodeName "testing";
+	Description "Debian Testing distribution - Not Released";
+	CodeName "woody";
+	OverrideCodeName "woody";
 	Priority "3";
   };
 
@@ -265,17 +309,18 @@ Suite
 	  "hppa" "";
 	  "hurd-i386" "";
 	  "i386" "";
+	  "ia64" "";
 	  "m68k" "";
 	  "mips" "";
 	  "mipsel" "";
 	  "powerpc" "";
+	  "s390" "";
 	  "sh" "";
 	  "sparc" "";
 	};
 	Announce "debian-devel-changes@lists.debian.org";
-	Version "2.3";
 	Origin "Debian";
-	Description "Debian 2.3 Unstable - Not Released";
+	Description "Debian Unstable - Not Released";
 	CodeName "sid";
 	OverrideCodeName "sid";
 	Priority "4";
@@ -287,6 +332,7 @@ Dir
 {
   RootDir "/org/ftp.debian.org/ftp/";
   PoolDir "/org/ftp.debian.org/ftp/pool/";
+  TemplatesDir "/org/ftp.debian.org/katie/templates/";
   PoolRoot "pool/";
   IncomingDir "/org/ftp.debian.org/incoming/";
   OverrideDir "/org/ftp.debian.org/scripts/override/";
@@ -296,7 +342,8 @@ Dir
 
 DB
 {
-  Host "ftp-master.debian.org";
+  Name "projectb";
+  Host ""; 
   Port -1;
   ROUser "nobody";
 };
@@ -311,10 +358,12 @@ Architectures
   hppa "HP PA RISC";
   arm "Arm";
   i386 "Intel ia32";
+  ia64 "Intel ia64";
   m68k "Motorola Mc680x0";
   mips "SGI MIPS";
   mipsel "SGI MIPS (Little Endian)";
   powerpc "PowerPC";
+  s390 "IBM S/390";
   sh "Hitatchi SuperH";
   sparc "Sun SPARC/UltraSPARC";
 
@@ -326,6 +375,7 @@ Archive
   ftp-master
   {
     OriginServer "ftp-master.debian.org";
+    PrimaryMirror "ftp.debian.org";
     Description "Master Archive for the Debian project";
   };
 
@@ -449,7 +499,7 @@ Location
   /org/ftp.debian.org/ftp/pool/
     {
       Archive "ftp-master";
-      Type "pool"
+      Type "pool";
     };
 
 };