sync

diff --git a/katie.conf b/katie.conf
index 1ba81fdc645d405ebd91ec8b362ca206c6bff552..6cc499cf7d6b116e590a4a83be755a7035408d2f 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -20,9 +20,11 @@ Dinstall
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
    FutureTimeTravelGrace 28800; // 6 hours
    PastCutoffYear "1984";
-   BXANotify 1;
+   BXANotify "true";
    SkipTime 300;
-   SpecialAcceptedAutoBuild 1;
+   SpecialAcceptedAutoBuild "true";
+   CloseBugs "true";
+   OverrideDisparityCheck "true";
 };
 
 Julia
@@ -275,30 +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/";
+  MorgueReject "reject";
+  Override "/org/ftp.debian.org/scripts/override/";
   AcceptedAutoBuild "/org/incoming.debian.org/buildd/";
-  UrgencyLogDir "/org/ftp.debian.org/testing/urgencies/";
+  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

diff --git a/katie.conf-non-US b/katie.conf-non-US
index f159705846fd580def1ac06c0f27ec565d3d862d..be37b8344fa79390b9f72120fda9e5abd4e34ca4 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -20,8 +20,10 @@ Dinstall
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
    FutureTimeTravelGrace 28800; // 6 hours
    PastCutoffYear "1984";
-   BXANotify 0;
+   BXANotify "false";
    SkipTime 300;
+   CloseBugs "true";
+   OverrideDisparityCheck "true";
 };
 
 Julia
@@ -267,27 +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/";
-  MorgueRejectDir "reject";
-  QueueRootDir "/org/non-us.debian.org/queue/";
-  QueueAcceptedDir "/org/non-us.debian.org/queue/accepted/";
-  QueueByhandDir "/org/non-us.debian.org/queue/byhand/";
-  QueueDoneDir "/org/non-us.debian.org/queue/done/";
-  QueueHoldingDir "/org/non-us.debian.org/queue/holding/";
-  QueueNewDir "/org/non-us.debian.org/queue/new/";
-  QueueRejectDir "/org/non-us.debian.org/queue/reject/";
-  QueueUncheckedDir "/org/non-us.debian.org/queue/unchecked/";
-  UrgencyLogDir "/org/non-us.debian.org/testing/";
+  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