X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=e61c51a4c342e6dd0305734fb1f512e2b47b45f9;hb=712f5cb88b001d0d71dad6372a141b2e01386cbb;hp=290f2d87af5149fc84c1b1daf9f3dc38e96af796;hpb=e4f2f33a24646716adedd63afa87a672cd6ed599;p=dak.git

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 290f2d87..e61c51a4 100644
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -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/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 "troup@auric.debian.org";
 
 };
 
@@ -82,6 +88,19 @@ Jenna
 
 };
 
+Madison
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Suite "";
+    Version "";
+   };
+
+};
+
 Shania
 {
 
@@ -139,6 +158,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 +180,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 +189,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";
-	Origin "Debian";
-	Description "Experimental packages - not released; use at your own risk.";
-	CodeName "experimental";
-	OverrideCodeName "experimental";
-	SingleOverrideFile "true";
-	Priority "0";
-        Tree "project/experimental";
-  };
+
+  // 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 +235,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 +260,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";
@@ -268,6 +290,7 @@ Suite
 	};
 	Origin "Debian";
 	Description "Debian Testing distribution - Not Released";
+	CodeName "woody";
 	OverrideCodeName "woody";
 	Priority "3";
   };
@@ -313,6 +336,7 @@ 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/";
@@ -321,7 +345,8 @@ Dir
 
 DB
 {
-  Host "non-us.debian.org";
+  Name "projectb";
+  Host "";
   Port -1;
   ROUser "nobody";
 };
@@ -353,6 +378,7 @@ Archive
   non-US 
   {
     OriginServer "non-us.debian.org";
+    PrimaryMirror "non-us.debian.org";
     Description "Non-US Archive for the Debian project";
   };