New version; handles multi-component version cleaning.

[dak.git] / katie.conf

diff --git a/katie.conf b/katie.conf
index 81f61b984118115413b4fb8aee85b0792cad6c86..2d957acc3da9c809932345b938802fef3ff3274e 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -16,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";
 
 };
 
@@ -49,6 +55,7 @@ Catherine
     Help "";
     Limit "";
     No-Action "";
+    Verbose "";
     Version "";
    };
 
@@ -160,7 +167,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";
 };
@@ -172,25 +179,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
@@ -266,9 +286,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";
   };
@@ -300,9 +320,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";
@@ -314,6 +333,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/";
@@ -323,7 +343,8 @@ Dir
 
 DB
 {
-  Host "ftp-master.debian.org";
+  Name "projectb";
+  Host ""; 
   Port -1;
   ROUser "nobody";
 };
@@ -355,6 +376,7 @@ Archive
   ftp-master
   {
     OriginServer "ftp-master.debian.org";
+    PrimaryMirror "ftp.debian.org";
     Description "Master Archive for the Debian project";
   };