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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index f727acfe..ff74a599 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";
@@ -23,16 +25,14 @@ Dinstall
    BXANotify "false";
    QueueBuildSuites
    {
-     oldstable;
      stable;
      testing;
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "oldstable";
+   DefaultSuite "stable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
-   StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
@@ -110,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 
@@ -174,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/";
@@ -194,6 +160,7 @@ Suite
 	  amd64; 
 	  alpha; 
 	  arm;
+	  armel;
 	  hppa;
 	  i386;
 	  ia64;
@@ -208,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/";
@@ -216,7 +184,6 @@ Suite
 
 SuiteMappings
 {
-  "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
@@ -239,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/";
@@ -249,6 +217,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 +241,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 +367,6 @@ Location
       Archive "security";
       Suites 
 	{
-	  Oldstable;
 	  Stable;
 	  Testing;
         };