Done isn't a queue either

[dak.git] / config / backports / dak.conf

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 82af9cadace0cda0d295919de53dda997abb3795..36e1a58ecdc05c7081d05ca24fcaf70f1598bd81 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -1,10 +1,5 @@
 Dinstall
 {
-   // Both need to be defined at the moment, but they can point to the
-   // same file.
-   GPGKeyring {
-      "/srv/backports-master.debian.org/keyrings/keyring.gpg";
-   };
    // To sign the release files. Adjust the keyid!
    // Note: Key must be without a passphrase or it wont work automagically!
    SigningKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
@@ -34,10 +29,7 @@ Dinstall
    CloseBugs "false";
    OverrideDisparityCheck "false";
    DefaultSuite "lenny-backports";
-   Reject
-   {
-     ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml";
-   };
+   ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml";
    // If set, only send mails to addresses listed there.
    // format of entries: one entry per line. Either an email address directly, or a regular expression,
    // prefixed by "RE:". Examples: "jane.doe@domain.com" or "RE:jane[^@]@domain.com", where the first will
@@ -210,25 +202,24 @@ Dir
   Pool "/srv/backports-master.debian.org/ftp/pool/";
   Export "/srv/backports-master.debian.org/export/";
   Templates "/srv/backports-master.debian.org/dak/templates/";
-  PoolRoot "pool/";
   Lists "/srv/backports-master.debian.org/database/dists/";
   Cache "/srv/backports-master.debian.org/database/";
   Log "/srv/backports-master.debian.org/log/";
   Lock "/srv/backports-master.debian.org/lock";
   Morgue "/srv/backports-master.debian.org/morgue/";
   Override "/srv/backports-master.debian.org/scripts/override/";
-  QueueBuild "/srv/backports-master.debian.org/buildd/";
   UrgencyLog "/srv/backports-master.debian.org/testing/urgencies/";
   TempPath "/srv/backports-master.debian.org/tmp";
+  BTSVersionTrack "/srv/backports-master.debian.org/queue/bts_version_track/";
+  Holding "/srv/backports-master.debian.org/queue/holding/";
+  Done "/srv/backports-master.debian.org/queue/done/";
+
   Queue
   {
     Byhand "/srv/backports-master.debian.org/queue/byhand/";
-    Done "/srv/backports-master.debian.org/queue/done/";
-    Holding "/srv/backports-master.debian.org/queue/holding/";
     New "/srv/backports-master.debian.org/queue/new/";
     Reject "/srv/backports-master.debian.org/queue/reject/";
     Unchecked "/srv/backports-master.debian.org/queue/unchecked/";
-    BTSVersionTrack "/srv/backports-master.debian.org/queue/bts_version_track/";
     Newstage "/srv/backports-master.debian.org/queue/newstage/";
     Embargoed "/srv/backports-master.debian.org/queue/Embargoed/";
     Unembargoed "/srv/backports-master.debian.org/queue/Unembargoed/";