X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=f159705846fd580def1ac06c0f27ec565d3d862d;hb=f22f57084bb5a6c4b30cd2dfcd138c9976db7fbf;hp=c14e8a427b8d736f4181d52dced0e6c2e1852ee4;hpb=b70a92c4d2ed83d2a801213a54718956c68d1655;p=dak.git

diff --git a/katie.conf-non-US b/katie.conf-non-US
index c14e8a42..f1597058 100644
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -3,25 +3,32 @@ 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 "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()
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
+   TrackingServer "packages.qa.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";
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
+   FutureTimeTravelGrace 28800; // 6 hours
+   PastCutoffYear "1984";
+   BXANotify 0;
+   SkipTime 300;
 };
 
 Julia
 {
   ValidGID "800";
   // Comma seperated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,www-data,katie";
+  KnownPostgres "postgres,www-data,katie,auric";
 };
 
 Shania
@@ -33,6 +40,15 @@ Shania
  MorgueSubDir "shania";
 };
 
+
+Catherine 
+{
+  Options 
+  {
+     Limit	10240;
+  };
+};
+
 Natalie
 {
   Options
@@ -118,9 +134,9 @@ Suite
 	  sparc "";
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "2.2r3";
+	Version "2.2r6";
 	Origin "Debian";
-	Description "Debian 2.2r3 Released 16th April 2001";
+	Description "Debian 2.2r6 Released 3rd April 2002";
 	CodeName "potato";
 	OverrideCodeName "potato";
 	Priority "1";
@@ -143,9 +159,10 @@ Suite
 	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
-	Version "2.2r4";
+	CopyKatie "/org/non-us.debian.org/queue/proposed-updates/";
+	Version "2.2r6";
 	Origin "Debian";
-	Description "Proposed Updates for Debian 2.2r4 - Not Released";
+	Description "Proposed Updates for Debian 2.2r6 - Not Released";
 	CodeName "proposed-updates";
 	OverrideCodeName "potato";
 	OverrideSuite "stable";
@@ -261,6 +278,16 @@ Dir
   ListsDir "/org/non-us.debian.org/database/dists/";
   LogDir "/org/non-us.debian.org/log/";
   Morgue "/org/non-us.debian.org/morgue/";
+  MorgueRejectDir "reject";
+  QueueRootDir "/org/non-us.debian.org/queue/";
+  QueueAcceptedDir "/org/non-us.debian.org/queue/accepted/";
+  QueueByhandDir "/org/non-us.debian.org/queue/byhand/";
+  QueueDoneDir "/org/non-us.debian.org/queue/done/";
+  QueueHoldingDir "/org/non-us.debian.org/queue/holding/";
+  QueueNewDir "/org/non-us.debian.org/queue/new/";
+  QueueRejectDir "/org/non-us.debian.org/queue/reject/";
+  QueueUncheckedDir "/org/non-us.debian.org/queue/unchecked/";
+  UrgencyLogDir "/org/non-us.debian.org/testing/";
 };
 
 DB
@@ -386,8 +413,16 @@ Location
 
 };
 
-Catherine {
-	Options {
-		Limit	10240;
-	};
+Urgency
+{
+  Default "low";
+  Valid
+  {
+    low "";
+    medium "";
+    high "";
+    emergency "";
+    critical "";
+  };
 };
+