X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=be37b8344fa79390b9f72120fda9e5abd4e34ca4;hb=ab41ecb56d308bb801add07b90a258c0b57718e1;hp=ab7c00e5ee7d9152222135916ff0e0a4205e7672;hpb=c862e435b16bcebb9d8c25fecb6064f4dfba1d01;p=dak.git

diff --git a/katie.conf-non-US b/katie.conf-non-US
index ab7c00e5..be37b834 100644
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -4,7 +4,7 @@ Dinstall
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "B8AE9B77 722F1AED";
+   SigningKeyIds "722F1AED";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -18,13 +18,19 @@ Dinstall
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
+   FutureTimeTravelGrace 28800; // 6 hours
+   PastCutoffYear "1984";
+   BXANotify "false";
+   SkipTime 300;
+   CloseBugs "true";
+   OverrideDisparityCheck "true";
 };
 
 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
@@ -36,6 +42,15 @@ Shania
  MorgueSubDir "shania";
 };
 
+
+Catherine 
+{
+  Options 
+  {
+     Limit	10240;
+  };
+};
+
 Natalie
 {
   Options
@@ -121,9 +136,9 @@ Suite
 	  sparc "";
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "2.2r5";
+	Version "2.2r6";
 	Origin "Debian";
-	Description "Debian 2.2r5 Released 10th January 2002";
+	Description "Debian 2.2r6 Released 3rd April 2002";
 	CodeName "potato";
 	OverrideCodeName "potato";
 	Priority "1";
@@ -146,9 +161,10 @@ Suite
 	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
-	Version "2.2r5";
+	CopyKatie "/org/non-us.debian.org/queue/proposed-updates/";
+	Version "2.2r6";
 	Origin "Debian";
-	Description "Proposed Updates for Debian 2.2r5 - Not Released";
+	Description "Proposed Updates for Debian 2.2r6 - Not Released";
 	CodeName "proposed-updates";
 	OverrideCodeName "potato";
 	OverrideSuite "stable";
@@ -253,17 +269,37 @@ Suite
 
 };
 
+SuiteMappings
+{
+ "map stable proposed-updates"
+ "map-unreleased stable unstable"
+ "map-unreleased proposed-updates unstable"
+ "ignore testing"
+};
+
 Dir
 {
-  RootDir "/org/non-us.debian.org/ftp/";
-  PoolDir "/org/non-us.debian.org/ftp/pool/";
+  Root "/org/non-us.debian.org/ftp/";
+  Pool "/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/";
-  LogDir "/org/non-us.debian.org/log/";
+  Templates "/org/non-us.debian.org/katie/templates/";
+  Override "/org/non-us.debian.org/scripts/override/";
+  Lists "/org/non-us.debian.org/database/dists/";
+  Log "/org/non-us.debian.org/log/";
   Morgue "/org/non-us.debian.org/morgue/";
+  MorgueReject "reject";
+  UrgencyLog "/org/non-us.debian.org/testing/";
+  Queue
+  {
+    Root "/org/non-us.debian.org/queue/";
+    Accepted "/org/non-us.debian.org/queue/accepted/";
+    Byhand "/org/non-us.debian.org/queue/byhand/";
+    Done "/org/non-us.debian.org/queue/done/";
+    Holding "/org/non-us.debian.org/queue/holding/";
+    New "/org/non-us.debian.org/queue/new/";
+    Reject "/org/non-us.debian.org/queue/reject/";
+    Unchecked "/org/non-us.debian.org/queue/unchecked/";
+  };
 };
 
 DB
@@ -389,8 +425,16 @@ Location
 
 };
 
-Catherine {
-	Options {
-		Limit	10240;
-	};
+Urgency
+{
+  Default "low";
+  Valid
+  {
+    low "";
+    medium "";
+    high "";
+    emergency "";
+    critical "";
+  };
 };
+