X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=e326354ab6399a61a7c8a17425764f5892a7b7b9;hb=2bf397e00e25bd7b3a5378727ca4eab8ba14d84c;hp=1f2bb46e09ecc31f14baa63dd402f48e0f9fb19e;hpb=9aac81c7f04b1896819de1ddd1a4b7eddd9ca8c5;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 1f2bb46e..e326354a 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; };
    };
 };
 
@@ -145,34 +144,14 @@ Check-Overrides
 
 Suite
 {
-  OldStable
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-  };
-
   Stable
   {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-  };
-
-  OldStable-Proposed-Updates
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
   };
 
   Proposed-Updates
@@ -238,14 +217,10 @@ 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";
@@ -253,13 +228,10 @@ SuiteMappings
  "map wheezy-proposed-updates testing-proposed-updates";
  "map sid unstable";
  "map rc-buggy experimental";
- "map oldstable oldstable-proposed-updates";
- "map oldstable-security oldstable-proposed-updates";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";
  "map stable-updates proposed-updates";
- "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
@@ -299,6 +271,7 @@ AutomaticByHandPackages {
 
 Dir
 {
+  Base "/srv/ftp-master.debian.org/";
   Root "/srv/ftp-master.debian.org/ftp/";
   Pool "/srv/ftp-master.debian.org/ftp/pool/";
   Templates "/srv/ftp-master.debian.org/dak/templates/";
@@ -315,20 +288,6 @@ Dir
   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
-  {
-    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/";
-    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/";
-  };
 };
 
 Queue-Report
@@ -386,8 +345,6 @@ Generate-Releases
 {
   MD5Sum
   {
-    oldstable;
-    oldstable-proposed-updates;
     proposed-updates;
     stable;
     squeeze-updates;
@@ -398,8 +355,6 @@ Generate-Releases
   };
   SHA1
   {
-    oldstable;
-    oldstable-proposed-updates;
     proposed-updates;
     squeeze-updates;
     stable;
@@ -410,8 +365,6 @@ Generate-Releases
   };
   SHA256
   {
-    oldstable;
-    oldstable-proposed-updates;
     proposed-updates;
     squeeze-updates;
     stable;