X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=config%2Fdebian-security%2Fdak.conf;h=7496da4aa41d0318b4f1ab34b2c70d4188ae760c;hb=9f371390bb90395b2f2f0b65c91c21047896774a;hp=f727acfe7da098f2d24c1bff56ff6e5f992631d4;hpb=a6496b978c3a3f5b3ab2eb752a59a6b711da61f8;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index f727acfe..7496da4a 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -1,7 +1,9 @@
 Dinstall
 {
-   PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
-   GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+   GPGKeyring {
+     "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+     "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
+   };
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
    SigningKeyIds "6070D3A1";
@@ -29,10 +31,9 @@ Dinstall
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "oldstable";
+   DefaultSuite "stable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
-   StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
@@ -110,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 
 	{
@@ -122,13 +123,12 @@ Suite
 	{
 	  source;  
 	  all;
-	  alpha;
 	  amd64; 
+	  alpha; 
 	  arm;
 	  hppa;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -136,12 +136,13 @@ Suite
 	  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/";
   };
 
@@ -160,6 +161,7 @@ Suite
 	  amd64; 
 	  alpha; 
 	  arm;
+	  armel;
 	  hppa;
 	  i386;
 	  ia64;
@@ -173,27 +175,28 @@ Suite
 	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 
+	Architectures
 	{
-	  source;  
+	  source;
 	  all;
-	  amd64; 
-	  alpha; 
-	  arm;
+	  amd64;
+	  alpha;
+	  armel;
 	  hppa;
 	  i386;
 	  ia64;
@@ -208,19 +211,21 @@ Suite
 	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";
 };
 
@@ -239,6 +244,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/";
@@ -249,6 +255,7 @@ Dir
     Reject "/org/security.debian.org/queue/reject/";
     Unchecked "/org/security.debian.org/queue/unchecked/";
     ProposedUpdates "/does/not/exist/"; // XXX fixme
+    OldProposedUpdates "/does/not/exist/"; // XXX fixme
 
     Embargoed "/org/security.debian.org/queue/embargoed/";
     Unembargoed "/org/security.debian.org/queue/unembargoed/";
@@ -272,9 +279,9 @@ Architectures
   alpha "DEC Alpha";
   hppa "HP PA RISC";
   arm "ARM";
+  armel "ARM EABI";
   i386 "Intel ia32";
   ia64 "Intel ia64";
-  m68k "Motorola Mc680x0";
   mips "MIPS (Big Endian)";
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";
@@ -398,7 +405,7 @@ Location
       Archive "security";
       Suites 
 	{
-	  Oldstable;
+	  OldStable;
 	  Stable;
 	  Testing;
         };