X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=43f7e7dd5c23ecb7c168a2a26d2f69f5e3f5947f;hb=b8f923796848479e35aafebb4fb7c7be1db46ef8;hp=5f8fd28f3d45fe95fbddc7e1003951dbb07e8601;hpb=e5485759099597123b0de2259ea5db2d7483d66c;p=dak.git

diff --git a/katie.conf b/katie.conf
index 5f8fd28f..43f7e7dd 100644
--- a/katie.conf
+++ b/katie.conf
@@ -4,7 +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 "38C6029A";
+   SigningKeyIds "1DB114E0";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -16,7 +16,7 @@ Dinstall
    LockFile "/org/ftp.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
-   FutureTimeTravelGrace 28800; // 6 hours
+   FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 300;
    BXANotify "true";
@@ -33,6 +33,26 @@ Dinstall
    };
 };
 
+Alicia
+{
+   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
+};
+
+Billie
+{
+  FTPPath "/org/ftp.debian.org/ftp";
+  TreeRootPath "/org/ftp.debian.org/scratch/dsilvers/treeroots";
+  TreeDatabasePath "/org/ftp.debian.org/scratch/dsilvers/treedbs";
+  BasicTrees { i386; powerpc; };
+  CombinationTrees
+  {
+    popular { i386; powerpc; all; source; };
+    welovehp { hppa; ia64; all; source; };
+    embedded { arm; mips; mipsel; source; };
+    source { source; };
+  };
+};
+
 Julia
 {
   ValidGID "800";
@@ -221,6 +241,10 @@ Suite
 	CodeName "sarge";
 	OverrideCodeName "sarge";
 	Priority "5";
+	UdebComponents
+	{
+	  main;
+	};
   };
 
   Testing-Proposed-Updates
@@ -267,6 +291,10 @@ Suite
 	    Experimental;
 	  };
 	};
+	UdebComponents
+	{
+	  main;
+	};
   };
 
   Unstable
@@ -370,14 +398,12 @@ Suite
 
 SuiteMappings
 {
- "map testing-security proposed-updates";
-
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
- //"map testing-security testing-proposed-updates";
+ "map testing-security testing-proposed-updates";
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
 };
@@ -398,7 +424,6 @@ Dir
   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/";
@@ -406,6 +431,7 @@ Dir
     New "/org/ftp.debian.org/queue/new/";
     Reject "/org/ftp.debian.org/queue/reject/";
     Unchecked "/org/ftp.debian.org/queue/unchecked/";
+    BTSVersionTrack "/org/ftp.debian.org/queue/bts_version_track/";
   };
 };