X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=b12b49e38dc81f920a8386a1ed3a98bf46951cea;hb=4914b5dde7ccfe58b5f88b9852deb0a19b804039;hp=1867de2d245d596360bfc9c1b177fdba899ce41d;hpb=dafb69e402e767834cf280bfb1b7a51bee812fdc;p=dak.git

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 1867de2d..b12b49e3 100644
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -3,7 +3,9 @@ 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";
+   SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
+   SigningKeyIds "B8AE9B77 722F1AED";
+   SendmailCommand "/usr/sbin/sendmail -odq -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()
@@ -14,8 +16,15 @@ Dinstall
    LockFile "/org/non-us.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
+   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
 };
 
+Julia
+{
+  ValidGID "800";
+  // Comma seperated list of users who are in Postgres but not the passwd file
+  KnownPostgres "postgres,www-data,katie";
+};
 
 Shania
 {
@@ -111,9 +120,9 @@ Suite
 	  sparc "";
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "2.2r3";
+	Version "2.2r5";
 	Origin "Debian";
-	Description "Debian 2.2r3 Released 16th April 2001";
+	Description "Debian 2.2r5 Released 10th January 2002";
 	CodeName "potato";
 	OverrideCodeName "potato";
 	Priority "1";
@@ -136,9 +145,9 @@ Suite
 	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
-	Version "2.2r4";
+	Version "2.2r5";
 	Origin "Debian";
-	Description "Proposed Updates for Debian 2.2r4 - Not Released";
+	Description "Proposed Updates for Debian 2.2r5 - Not Released";
 	CodeName "proposed-updates";
 	OverrideCodeName "potato";
 	OverrideSuite "stable";
@@ -163,7 +172,10 @@ Suite
 	  i386 "";
 	  ia64 "";
 	  m68k "";
+	  mips "";
+	  mipsel "";
 	  powerpc "";
+	  s390 "";
 	  sparc "";
 	};
 	Origin "Debian";
@@ -191,7 +203,10 @@ Suite
 	  i386 "";
 	  ia64 "";
 	  m68k "";
+	  mips "";
+	  mipsel "";
 	  powerpc "";
+	  s390 "";
 	  sparc "";
 	};
 	Origin "Debian";
@@ -372,3 +387,9 @@ Location
     };
 
 };
+
+Catherine {
+	Options {
+		Limit	10240;
+	};
+};