X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=ff74a599bf07cc5fed1f18f01b252b77b767ab34;hb=0fbf46fb7da5309d9fca4761178c1375cb8916ee;hp=6e2ebc708f604381ea53db4952ae1dfeec10f978;hpb=aa43d9d1dd9d440c22c86c93d195c1b2b15ce216;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 6e2ebc70..ff74a599 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -25,7 +25,6 @@ Dinstall
    BXANotify "false";
    QueueBuildSuites
    {
-     oldstable;
      stable;
      testing;
    };
@@ -34,7 +33,6 @@ Dinstall
    DefaultSuite "stable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
-   StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
@@ -112,41 +110,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;
-	};
-	Architectures 
-	{
-	  source;  
-	  all;
-	  alpha;
-	  amd64; 
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  m68k;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
-	Announce "dak@security.debian.org";
-	Version "3.1";
-	Origin "Debian";
-	Label "Debian-Security";
-	Description "Debian 3.1 Security Updates";
-	CodeName "sarge";
-	OverrideCodeName "sarge";
-	CopyDotDak "/org/security.debian.org/queue/done/";
-  };
-
   Stable
   {
 	Components 
@@ -176,6 +139,7 @@ Suite
 	Origin "Debian";
 	Label "Debian-Security";
 	Description "Debian 4.0 Security Updates";
+	ValidTime 864000; // 10 days
 	CodeName "etch";
 	OverrideCodeName "etch";
 	CopyDotDak "/org/security.debian.org/queue/done/";
@@ -211,6 +175,7 @@ Suite
 	Origin "Debian";
 	Label "Debian-Security";
 	Description "Debian testing Security Updates";
+	ValidTime 864000; // 10 days
 	CodeName "lenny";
 	OverrideCodeName "lenny";
 	CopyDotDak "/org/security.debian.org/queue/done/";
@@ -219,7 +184,6 @@ Suite
 
 SuiteMappings
 {
-  "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
@@ -242,6 +206,7 @@ Dir
   MorgueReject "reject";
   Override "/org/security.debian.org/scripts/override/";
   QueueBuild "/org/security.debian.org/buildd/";
+  Upload "/srv/queued/UploadQueue/";
   Queue
   {
     Accepted "/org/security.debian.org/queue/accepted/";
@@ -279,7 +244,6 @@ Architectures
   armel "ARM EABI";
   i386 "Intel ia32";
   ia64 "Intel ia64";
-  m68k "Motorola Mc680x0";
   mips "MIPS (Big Endian)";
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";
@@ -403,7 +367,6 @@ Location
       Archive "security";
       Suites 
 	{
-	  Oldstable;
 	  Stable;
 	  Testing;
         };