X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=katie.conf;h=0fd754016a143371f50ba938a65f862359003d55;hb=bff9fbafb548106326749e4534e3378974edcdc5;hp=c665c91208acfb0299f4ec1cd17332a084f557c7;hpb=a8487737ac65dea99f901259c0c6169a086a9389;p=dak.git

diff --git a/katie.conf b/katie.conf
index c665c912..0fd75401 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,17 @@ 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";
+   PackagesServer "packages.debian.org";
    NewAckList "/org/ftp.debian.org/katie/log";
    LockFile "/org/ftp.debian.org/katie/lock";
+   Bcc "troup@auric.debian.org";
 
 };
 
@@ -41,6 +46,21 @@ Heidi
 
 };
 
+Catherine
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Limit "";
+    No-Action "";
+    Verbose "";
+    Version "";
+   };
+
+};
+
 Tea
 {
 
@@ -69,6 +89,19 @@ Jenna
 
 };
 
+Madison
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Suite "";
+    Version "";
+   };
+
+};
+
 Shania
 {
 
@@ -103,6 +136,7 @@ Natalie
    };
 
  ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
+ LockFile "natalie";
 };
 
 Melanie
@@ -115,6 +149,7 @@ Melanie
     Version "";
     Architecture "";
     Binary-Only "";
+    Carbon-Copy "";
     Component "";
     Done "";
     No-Action "";
@@ -126,6 +161,7 @@ Melanie
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
    LogFile "/org/ftp.debian.org/web/removals.txt";
+   Bcc "removed-packages@qa.debian.org";
 };
 
 Neve
@@ -147,7 +183,7 @@ Rhona
    };
 
   // How long (in seconds) dead packages are left before being killed
-  StayOfExecution 0; // 0 days
+  StayOfExecution 172800; // 2 days
   MorgueSubDir "rhona";
   OverrideFilename "override.source-only";
 };
@@ -159,25 +195,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
@@ -253,9 +302,9 @@ Suite
 	  "powerpc" "";
 	  "sparc" "";
 	};
-	Version "2.3-testing";
 	Origin "Debian";
-	Description "Debian 2.3 Testing distribution - Not Released";
+	Description "Debian Testing distribution - Not Released";
+	CodeName "woody";
 	OverrideCodeName "woody";
 	Priority "3";
   };
@@ -287,9 +336,8 @@ Suite
 	  "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";
@@ -301,6 +349,8 @@ Dir
 {
   RootDir "/org/ftp.debian.org/ftp/";
   PoolDir "/org/ftp.debian.org/ftp/pool/";
+  TemplatesDir "/org/ftp.debian.org/katie/templates/";
+  LockDir "/org/ftp.debian.org/katie/locks/";
   PoolRoot "pool/";
   IncomingDir "/org/ftp.debian.org/incoming/";
   OverrideDir "/org/ftp.debian.org/scripts/override/";
@@ -310,7 +360,8 @@ Dir
 
 DB
 {
-  Host "ftp-master.debian.org";
+  Name "projectb";
+  Host ""; 
   Port -1;
   ROUser "nobody";
 };
@@ -342,6 +393,7 @@ Archive
   ftp-master
   {
     OriginServer "ftp-master.debian.org";
+    PrimaryMirror "ftp.debian.org";
     Description "Master Archive for the Debian project";
   };