X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=fc2c52d3bea3b061fed5bd9d6fcf3a26656390a0;hb=79011f8bc9062017ac69772b61288b533b0851f3;hp=8c13ff0c2c965063198abddd02f1ca52424759ba;hpb=bfe579f11d1eb9f94cb5c755b5c568502135441a;p=dak.git

diff --git a/katie.conf b/katie.conf
index 8c13ff0c..fc2c52d3 100644
--- a/katie.conf
+++ b/katie.conf
@@ -3,6 +3,8 @@ Dinstall
    PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
+   SigningPubKeyring "/org/ftp.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";
@@ -10,11 +12,16 @@ Dinstall
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
+   TrackingServer "packages.qa.debian.org";
    NewAckList "/org/ftp.debian.org/katie/log";
    LockFile "/org/ftp.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 1;
+   SkipTime 300;
 };
 
 Julia
@@ -132,9 +139,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";
@@ -157,9 +164,10 @@ Suite
 	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
-	Version "2.2r4";
+	CopyKatie "/org/ftp.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";
@@ -277,6 +285,17 @@ Dir
   ListsDir "/org/ftp.debian.org/database/dists/";
   LogDir "/org/ftp.debian.org/log/";
   Morgue "/org/ftp.debian.org/morgue/";
+  MorgueRejectDir "reject";
+  OverrideDir "/org/ftp.debian.org/scripts/override/";
+  QueueRootDir "/org/ftp.debian.org/queue/";
+  QueueAcceptedDir "/org/ftp.debian.org/queue/accepted/";
+  QueueByhandDir "/org/ftp.debian.org/queue/byhand/";
+  QueueDoneDir "/org/ftp.debian.org/queue/done/";
+  QueueHoldingDir "/org/ftp.debian.org/queue/holding/";
+  QueueNewDir "/org/ftp.debian.org/queue/new/";
+  QueueRejectDir "/org/ftp.debian.org/queue/reject/";
+  QueueUncheckedDir "/org/ftp.debian.org/queue/unchecked/";
+  UrgencyLogDir "/org/ftp.debian.org/testing/urgencies/";
 };
 
 DB
@@ -284,6 +303,13 @@ DB
   Name "projectb";
   Host ""; 
   Port -1;
+
+  NonUSName "projectb";
+  NonUSHost "non-US.debian.org";
+  NonUSPort -1;
+  NonUSUser "auric";
+  NonUSPassword "moo";
+
 };
 
 Architectures
@@ -442,8 +468,15 @@ Location
 
 };
 
-Catherine {
-	Options {
-		Limit	20480;
-	};
+Urgency
+{
+  Default "low";
+  Valid
+  {
+    low "";
+    medium "";
+    high "";
+    emergency "";
+    critical "";
+  };
 };