X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=7c5d57f686f93f6ac0f1ecaa1c26b2735a2a1888;hb=e13fd3c48245d48b0335649d294aacaee666bab5;hp=721950b9fa765c930fe54c53647b8eecae78621c;hpb=7ba4ac6dfc9ec4473e99b814a35add978cc00264;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 721950b9..7c5d57f6 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";
@@ -42,7 +41,7 @@ Generate-Index-Diffs
    Options
    {
      TempDir "/srv/ftp-master.debian.org/tiffani";
-     MaxDiffs { Default 14; };
+     MaxDiffs { Default 56; };
    };
 };
 
@@ -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";
@@ -251,14 +237,11 @@ Suite
 
 SuiteMappings
 {
- "silent-map lenny-security oldstable-security";
  "silent-map squeeze-security stable-security";
  "silent-map wheezy-security testing-security";
  "propup-version oldstable-security stable testing testing-proposed-updates unstable";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
- "map lenny oldstable";
- "map lenny-proposed-updates oldstable-proposed-updates";
  "map squeeze stable";
  "map squeeze-proposed-updates proposed-updates";
  "map squeeze-updates proposed-updates";
@@ -327,21 +310,7 @@ Dir
   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/";
-
-  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/";
-    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/";
-    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/";
-  };
+  Reject "/srv/ftp-master.debian.org/queue/reject/";
 };
 
 Queue-Report