X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=6cc499cf7d6b116e590a4a83be755a7035408d2f;hb=ab41ecb56d308bb801add07b90a258c0b57718e1;hp=fc2c52d3bea3b061fed5bd9d6fcf3a26656390a0;hpb=bc12f52ceb4bf0d36fe6f25386ed3903c93308ec;p=dak.git

diff --git a/katie.conf b/katie.conf
index fc2c52d3..6cc499cf 100644
--- a/katie.conf
+++ b/katie.conf
@@ -20,8 +20,11 @@ Dinstall
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
    FutureTimeTravelGrace 28800; // 6 hours
    PastCutoffYear "1984";
-   BXANotify 1;
+   BXANotify "true";
    SkipTime 300;
+   SpecialAcceptedAutoBuild "true";
+   CloseBugs "true";
+   OverrideDisparityCheck "true";
 };
 
 Julia
@@ -73,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";
 };
@@ -273,29 +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/";
-  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/";
+  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