fix queue directory configuration problem

diff --git a/config/debian-r/dak.conf b/config/debian-r/dak.conf
index 96cd03dc2af14fbd6b25235b885e8a48cc03d102..f87dea89d70add6a62a6eccc633c2588811487cb 100644 (file)
--- a/config/debian-r/dak.conf
+++ b/config/debian-r/dak.conf
@@ -171,33 +171,20 @@ Dir
 {
   Root "/srv/debian-r/ftp/";
   Pool "/srv/debian-r/ftp/pool/";
+  Templates "/srv/debian-r/dak/templates/";
   Export "/srv/debian-r/export/";
-  Dak "/srv/dak/dak/";
-  Templates "/srv/dak/dak/templates/";
-  Override "/srv/debian-r/override/";
-  Lock "/srv/dak/lock/";
+  Lists "/srv/debian-r/database/dists/";
   Cache "/srv/debian-r/database/";
-  Log "/srv/debian-r/dak-log/";
+  Log "/srv/debian-r/log/";
+  Lock "/srv/debian-r/lock";
   Morgue "/srv/debian-r/morgue/";
   Override "/srv/debian-r/scripts/override/";
+  UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
+  TempPath "/srv/debian-r/tmp/";
+  BTSVersionTrack "/srv/debian-r/queue/bts_version_track/";
   Holding "/srv/debian-r/queue/holding/";
   Done "/srv/debian-r/queue/done/";
   Reject "/srv/debian-r/queue/reject/";
-
-  Queue
-  {
-    Byhand "/srv/debian-r/queue/byhand/";
-    New "/srv/debian-r/queue/new/";
-    Unchecked "/srv/debian-r/queue/unchecked/";
-    Newstage "/srv/debian-r/queue/newstage/";
-
-    ProposedUpdates "/srv/debian-r/does/not/exist/"; // XXX fixme
-    OldProposedUpdates "/srv/debian-r/does/not/exist/"; // XXX fixme
-
-    Embargoed "/srv/debian-r/queue/embargoed/";
-    Unembargoed "/srv/debian-r/queue/unembargoed/";
-    Disembargo "/srv/debian-r/queue/unchecked-disembargo/";
-  };
 };
 
 DB