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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 6e2ebc70..0f77a7f4 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -2,11 +2,10 @@ Dinstall
 {
    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";
+   SigningKeyIds "55BE302B";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -34,13 +33,13 @@ Dinstall
    DefaultSuite "stable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
-   StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
 Process-New
 {
   AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock";
+  LockDir "/srv/security-master.debian.org/lock/new/";
 };
 
 Import-Users-From-Passwd
@@ -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";
@@ -337,31 +290,45 @@ ComponentMappings
 Section
 {
   admin;
-  base;
+  cli-mono;
   comm;
+  database;
   debian-installer;
+  debug;
   devel;
   doc;
   editors;
-  electronics;
   embedded;
+  electronics;
+  fonts;
   games;
   gnome;
   graphics;
+  gnu-r;
+  gnustep;
   hamradio;
+  haskell;
+  httpd;
   interpreters;
+  java;
   kde;
+  kernel;
   libdevel;
   libs;
+  lisp;
+  localization;
   mail;
   math;
   misc;
   net;
   news;
+  ocaml;
   oldlibs;
   otherosfs;
   perl;
+  php;
   python;
+  ruby;
   science;
   shells;
   sound;
@@ -369,8 +336,11 @@ Section
   text;
   utils;
   web;
+  vcs;
+  video;
   x11;
-  non-US;
+  xfce;
+  zope;
 };
 
 Priority
@@ -392,18 +362,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;
         };