X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=6035bf01e109b9b1286fbe810c0fe4e304180fed;hb=3670b5f49b4d70a8eaf7ac24f50a541c9286fde2;hp=bc978ee20a413e4f638955203f4c91bb48ce760b;hpb=212ecef347f2ec35e3f0261ed8885569f22235b7;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index bc978ee2..6035bf01 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -31,10 +31,9 @@ Dinstall
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "oldstable";
+   DefaultSuite "stable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
-   StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
@@ -112,7 +111,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  Oldstable
+  OldStable
   {
 	Components 
 	{
@@ -120,30 +119,14 @@ Suite
 	  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";
+	Version "";
 	Origin "Debian";
 	Label "Debian-Security";
-	Description "Debian 3.1 Security Updates";
-	CodeName "sarge";
-	OverrideCodeName "sarge";
+	Description "Debian 4.0 Security Updates";
+	ValidTime 864000; // 10 days
+	CodeName "etch";
+	OverrideCodeName "etch";
 	CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
@@ -155,75 +138,45 @@ Suite
 	  updates/contrib;
 	  updates/non-free;
 	};
-	Architectures 
-	{
-	  source;  
-	  all;
-	  amd64; 
-	  alpha; 
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "dak@security.debian.org";
 	Version "";
 	Origin "Debian";
 	Label "Debian-Security";
-	Description "Debian 4.0 Security Updates";
-	CodeName "etch";
-	OverrideCodeName "etch";
+	Description "Debian 5.0 Security Updates";
+	ValidTime 864000; // 10 days
+	CodeName "lenny";
+	OverrideCodeName "lenny";
 	CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
   Testing
   {
-	Components 
+	Components
 	{
 	  updates/main;
 	  updates/contrib;
 	  updates/non-free;
 	};
-	Architectures 
-	{
-	  source;  
-	  all;
-	  amd64; 
-	  alpha; 
-	  arm;
-	  armel;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "dak@security.debian.org";
 	Version "";
 	Origin "Debian";
 	Label "Debian-Security";
 	Description "Debian testing Security Updates";
-	CodeName "lenny";
-	OverrideCodeName "lenny";
+	ValidTime 864000; // 10 days
+	CodeName "squeeze";
+	OverrideCodeName "squeeze";
 	CopyDotDak "/org/security.debian.org/queue/done/";
   };
 };
 
 SuiteMappings
 {
-  "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
+ "silent-map oldstable-security oldstable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
-  "silent-map etch-secure stable";
+  "silent-map etch-secure oldstable";
+  "silent-map lenny-secure stable";
   "silent-map testing-security testing";
 };
 
@@ -242,6 +195,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 +233,6 @@ Architectures
   armel "ARM EABI";
   i386 "Intel ia32";
   ia64 "Intel ia64";
-  m68k "Motorola Mc680x0";
   mips "MIPS (Big Endian)";
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";
@@ -392,18 +345,12 @@ OverrideType
 
 Location
 {
-  /org/security.debian.org/ftp/dists/
-    {
-      Archive "security";
-      Type "legacy";
-    };
-
   /org/security.debian.org/ftp/pool/
     {
       Archive "security";
       Suites 
 	{
-	  Oldstable;
+	  OldStable;
 	  Stable;
 	  Testing;
         };