sync

[dak.git] / katie.conf-non-US

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 11fd24a422e8d3d33474867622a17de9c606d71b..c60d64a5c73ce7656b5fd9c690957690df0dcea9 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -16,11 +16,18 @@ Dinstall
 
    PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+   SigningKeyring "/org/non-us.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/non-us.debian.org/katie/log";
    LockFile "/org/non-us.debian.org/katie/lock";
+   Bcc "archive@ftp-master.debian.org";
+   GroupOverrideFilename "override.group-maint";
 
 };
 
@@ -82,6 +89,19 @@ Jenna
 
 };
 
+Madison
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Suite "";
+    Version "";
+   };
+
+};
+
 Shania
 {
 
@@ -139,6 +159,7 @@ Melanie
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
    LogFile "/home/troup/public_html/removals.txt";
+   Bcc "removed-packages@qa.debian.org";
 };
 
 Neve
@@ -160,7 +181,7 @@ Rhona
    };
 
   // How long (in seconds) dead packages are left before being killed
-  StayOfExecution 0; // 0 days
+  StayOfExecution 129600; // 1.5 days
   MorgueSubDir "rhona";
   OverrideFilename "override.source-only";
 };
@@ -169,29 +190,31 @@ Suite
 {
 
   // Priority determines which suite is used for the Maintainers filed as generated by charisma/da_mkmaintainers (highest wins)
-  
-  Experimental
-  {
-       Architectures 
-       {
-         "source" "";  
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "i386" "";
-         "m68k" "";
-         "powerpc" "";
-         "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";
-       Priority "0";
-  };
+
+  // non-US doesn't have experimental (yet)  
+//    Experimental
+//    {
+//     Architectures 
+//     {
+//       "source" "";  
+//       "all" "";
+//       "alpha" ""; 
+//       "arm" "";
+//       "i386" "";
+//       "m68k" "";
+//       "powerpc" "";
+//       "sparc" "";
+//     };
+//     Announce "debian-devel-changes@lists.debian.org";
+//     Origin "Debian";
+//     Description "Experimental packages - not released; use at your own risk.";
+//     CodeName "experimental";
+//     OverrideCodeName "experimental";
+//     SingleOverrideFile "true";
+//     NotAutomatic "yes";
+//     Priority "0";
+//          Tree "project/experimental";
+//    };
 
   Stable
   {
@@ -213,9 +236,9 @@ Suite
          "sparc" "";
        };
        Announce "debian-changes@lists.debian.org";
-       Version "2.2r2";
+       Version "2.2r3";
        Origin "Debian";
-       Description "Debian 2.2r2 Released 5th December 2000";
+       Description "Debian 2.2r3 Released 16th April 2001";
        CodeName "potato";
        OverrideCodeName "potato";
        Priority "1";
@@ -238,9 +261,9 @@ Suite
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
-       Version "2.2r3";
+       Version "2.2r4";
        Origin "Debian";
-       Description "Proposed Updates for Debian 2.2r3 - Not Released";
+       Description "Proposed Updates for Debian 2.2r4 - Not Released";
        CodeName "proposed-updates";
        OverrideCodeName "potato";
        OverrideSuite "stable";
@@ -261,18 +284,48 @@ Suite
          "all" "";
          "alpha" ""; 
          "arm" "";
+         "hppa" "";
          "i386" "";
+         "ia64" "";
          "m68k" "";
          "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";
   };
 
+  Woody-Proposed-Updates
+  {
+       Components 
+       {
+         non-US/main "";
+         non-US/contrib "";
+         non-US/non-free "";
+       };
+       Architectures 
+       {
+         "source" "";  
+         "all" "";
+         "alpha" ""; 
+         "arm" "";
+         "hppa" "";
+         "i386" "";
+         "ia64" "";
+         "m68k" "";
+         "powerpc" "";
+         "sparc" "";
+       };
+       Origin "Debian";
+       Description "Debian Testing distribution updates - Not Released";
+       CodeName "woody-proposed-updates";
+       OverrideCodeName "woody";
+       Priority "4";
+  };
+
   Unstable
   {
        Components 
@@ -300,12 +353,11 @@ 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";
+       Priority "5";
   };
 
 };
@@ -315,17 +367,19 @@ Dir
   RootDir "/org/non-us.debian.org/ftp/";
   PoolDir "/org/non-us.debian.org/ftp/pool/";
   PoolRoot "pool/";
+  TemplatesDir "/org/non-us.debian.org/katie/templates/";
   IncomingDir "/org/non-us.debian.org/incoming/";
   OverrideDir "/org/non-us.debian.org/scripts/override/";
   ListsDir "/org/non-us.debian.org/database/dists/";
+  LogDir "/org/non-us.debian.org/log/";
   Morgue "/org/non-us.debian.org/morgue/";
 };
 
 DB
 {
-  Host "non-us.debian.org";
+  Name "projectb";
+  Host "";
   Port -1;
-  ROUser "nobody";
 };
 
 Architectures
@@ -355,6 +409,7 @@ Archive
   non-US 
   {
     OriginServer "non-us.debian.org";
+    PrimaryMirror "non-us.debian.org";
     Description "Non-US Archive for the Debian project";
   };