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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index d0d4fb94..bcf82ece 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -11,7 +11,6 @@ Dinstall
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
-   LockFile "/org/security-master.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
    // GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
@@ -127,25 +126,6 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  OldStable
-  {
-	Components 
-	{
-	  updates/main;
-	  updates/contrib;
-	  updates/non-free;
-	};
-	Announce "dak@security.debian.org";
-	Version "";
-	Origin "Debian";
-	Label "Debian-Security";
-	Description "Debian 5.0 Security Updates";
-	ValidTime 864000; // 10 days
-	CodeName "lenny";
-	OverrideCodeName "lenny";
-	CopyDotDak "/srv/security-master.debian.org/queue/done/";
-  };
-
   Stable
   {
 	Components
@@ -189,18 +169,15 @@ SuiteMappings
 {
  "silent-map stable-security stable";
  "silent-map oldstable-security oldstable";
- // JT - FIXME, hackorama
- // "silent-map testing-security stable";
   "silent-map etch-secure oldstable";
-  "silent-map lenny-secure stable";
   "silent-map testing-security testing";
-  "silent-map lenny-security oldstable";
   "silent-map squeeze-security stable";
   "silent-map wheezy-security testing";
 };
 
 Dir
 {
+  Base "/srv/security-master.debian.org/";
   Root "/srv/security-master.debian.org/ftp/";
   Pool "/srv/security-master.debian.org/ftp/pool/";
   Export "/srv/security-master.debian.org/export/";