X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=503659aca88bd2199287b40f593b477aa1e8bb13;hb=b488bb6a14c4376fb533a544d1c24d4ce74a0f5f;hp=b342a4af895ff42c8ddad3d2e301471f8c850a31;hpb=8998291b0c20e4e08c020f30e3939e50c9a94f76;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b342a4af..503659ac 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -11,7 +11,6 @@ Dinstall
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   LockFile "/srv/ftp-master.debian.org/lock/dinstall.lock";
    Bcc "archive@ftp-master.debian.org";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
@@ -95,19 +94,6 @@ Rm
    Bcc "removed-packages@qa.debian.org";
 };
 
-Import-Archive
-{
-  ExportDir "/srv/ftp-master.debian.org/dak/import-archive-files/";
-};
-
-Import-Keyring
-{
-  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
-    {
-      Debian-Maintainer "true";
-    };
-};
-
 Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
@@ -324,23 +310,10 @@ Dir
   Override "/srv/ftp-master.debian.org/scripts/override/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   TempPath "/srv/ftp-master.debian.org/tmp/";
-  Queue
-  {
-    Byhand "/srv/ftp-master.debian.org/queue/byhand/";
-    ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
-    OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/";
-    ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
-    Done "/srv/ftp-master.debian.org/queue/done/";
-    Holding "/srv/ftp-master.debian.org/queue/holding/";
-    New "/srv/ftp-master.debian.org/queue/new/";
-    Reject "/srv/ftp-master.debian.org/queue/reject/";
-    Unchecked "/srv/ftp-master.debian.org/queue/unchecked/";
-    Newstage "/srv/ftp-master.debian.org/queue/newstage/";
-    BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
-    Embargoed "/srv/ftp-master.debian.org/does/not/exist/";
-    Unembargoed "/srv/ftp-master.debian.org/does/not/exist/";
-    Disembargo "/srv/ftp-master.debian.org/does/not/exist/";
-  };
+  BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
+  Holding "/srv/ftp-master.debian.org/queue/holding/";
+  Done "/srv/ftp-master.debian.org/queue/done/";
+  Reject "/srv/ftp-master.debian.org/queue/reject/";
 };
 
 Queue-Report