X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=katie.conf;h=6cc499cf7d6b116e590a4a83be755a7035408d2f;hb=ab41ecb56d308bb801add07b90a258c0b57718e1;hp=3f2b1061f6024ef4db2e5342564ea9a74e9d87ae;hpb=4258280bbbea3f80e3a8d98a1f7da361173fee36;p=dak.git

diff --git a/katie.conf b/katie.conf
index 3f2b1061..6cc499cf 100644
--- a/katie.conf
+++ b/katie.conf
@@ -4,6 +4,7 @@ Dinstall
    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";
@@ -11,11 +12,19 @@ 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 "true";
+   SkipTime 300;
+   SpecialAcceptedAutoBuild "true";
+   CloseBugs "true";
+   OverrideDisparityCheck "true";
 };
 
 Julia
@@ -67,6 +76,7 @@ Rhona
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
+  AcceptedAutoBuildStayOfExecution 86400; // 24 hours
   MorgueSubDir "rhona";
   OverrideFilename "override.source-only";
 };
@@ -133,9 +143,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";
@@ -158,9 +168,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";
@@ -266,18 +277,39 @@ Suite
 
 };
 
+SuiteMappings
+{
+ "map stable proposed-updates"
+ "map-unreleased stable unstable"
+ "map-unreleased proposed-updates unstable"
+ "ignore testing"
+};
+
 Dir
 {
-  RootDir "/org/ftp.debian.org/ftp/";
-  PoolDir "/org/ftp.debian.org/ftp/pool/";
-  TemplatesDir "/org/ftp.debian.org/katie/templates/";
-  LockDir "/org/ftp.debian.org/katie/locks/";
+  Root "/org/ftp.debian.org/ftp/";
+  Pool "/org/ftp.debian.org/ftp/pool/";
+  Templates "/org/ftp.debian.org/katie/templates/";
   PoolRoot "pool/";
-  IncomingDir "/org/ftp.debian.org/incoming/";
-  OverrideDir "/org/ftp.debian.org/scripts/override/";
-  ListsDir "/org/ftp.debian.org/database/dists/";
-  LogDir "/org/ftp.debian.org/log/";
+  Override "/org/ftp.debian.org/scripts/override/";
+  Lists "/org/ftp.debian.org/database/dists/";
+  Log "/org/ftp.debian.org/log/";
   Morgue "/org/ftp.debian.org/morgue/";
+  MorgueReject "reject";
+  Override "/org/ftp.debian.org/scripts/override/";
+  AcceptedAutoBuild "/org/incoming.debian.org/buildd/";
+  UrgencyLog "/org/ftp.debian.org/testing/urgencies/";
+  Queue
+  {  
+    Root "/org/ftp.debian.org/queue/";
+    Accepted "/org/ftp.debian.org/queue/accepted/";
+    Byhand "/org/ftp.debian.org/queue/byhand/";
+    Done "/org/ftp.debian.org/queue/done/";
+    Holding "/org/ftp.debian.org/queue/holding/";
+    New "/org/ftp.debian.org/queue/new/";
+    Reject "/org/ftp.debian.org/queue/reject/";
+    Unchecked "/org/ftp.debian.org/queue/unchecked/";
+  };
 };
 
 DB
@@ -285,6 +317,13 @@ DB
   Name "projectb";
   Host ""; 
   Port -1;
+
+  NonUSName "projectb";
+  NonUSHost "non-US.debian.org";
+  NonUSPort -1;
+  NonUSUser "auric";
+  NonUSPassword "moo";
+
 };
 
 Architectures
@@ -443,8 +482,15 @@ Location
 
 };
 
-Catherine {
-	Options {
-		Limit	20480;
-	};
+Urgency
+{
+  Default "low";
+  Valid
+  {
+    low "";
+    medium "";
+    high "";
+    emergency "";
+    critical "";
+  };
 };