X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=c60d64a5c73ce7656b5fd9c690957690df0dcea9;hb=b618ca40333f46edada83f0329f85cec83bca7eb;hp=4ea1ce6e1dbf7af111463763a410038579acb0dc;hpb=012892dbe0cfac83876d5f4cc8a65cce1d748947;p=dak.git

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 4ea1ce6e..c60d64a5 100644
--- 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";
 };
@@ -190,6 +211,7 @@ Suite
 //  	CodeName "experimental";
 //  	OverrideCodeName "experimental";
 //  	SingleOverrideFile "true";
+//	NotAutomatic "yes";
 //  	Priority "0";
 //          Tree "project/experimental";
 //    };
@@ -214,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";
@@ -239,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";
@@ -262,7 +284,9 @@ Suite
 	  "all" "";
 	  "alpha" ""; 
 	  "arm" "";
+	  "hppa" "";
 	  "i386" "";
+	  "ia64" "";
 	  "m68k" "";
 	  "powerpc" "";
 	  "sparc" "";
@@ -274,6 +298,34 @@ Suite
 	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 
@@ -305,7 +357,7 @@ Suite
 	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";
   };