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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index ff74a599..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";
@@ -25,6 +24,7 @@ Dinstall
    BXANotify "false";
    QueueBuildSuites
    {
+     oldstable;
      stable;
      testing;
    };
@@ -39,6 +39,7 @@ Dinstall
 Process-New
 {
   AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock";
+  LockDir "/srv/security-master.debian.org/lock/new/";
 };
 
 Import-Users-From-Passwd
@@ -110,7 +111,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  Stable
+  OldStable
   {
 	Components 
 	{
@@ -118,22 +119,6 @@ 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";
@@ -145,7 +130,7 @@ Suite
 	CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
-  Testing
+  Stable
   {
 	Components 
 	{
@@ -153,22 +138,24 @@ Suite
 	  updates/contrib;
 	  updates/non-free;
 	};
-	Architectures 
+	Announce "dak@security.debian.org";
+	Version "";
+	Origin "Debian";
+	Label "Debian-Security";
+	Description "Debian 5.0 Security Updates";
+	ValidTime 864000; // 10 days
+	CodeName "lenny";
+	OverrideCodeName "lenny";
+	CopyDotDak "/org/security.debian.org/queue/done/";
+  };
+
+  Testing
+  {
+	Components
 	{
-	  source;  
-	  all;
-	  amd64; 
-	  alpha; 
-	  arm;
-	  armel;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
+	  updates/main;
+	  updates/contrib;
+	  updates/non-free;
 	};
 	Announce "dak@security.debian.org";
 	Version "";
@@ -176,8 +163,8 @@ Suite
 	Label "Debian-Security";
 	Description "Debian testing Security Updates";
 	ValidTime 864000; // 10 days
-	CodeName "lenny";
-	OverrideCodeName "lenny";
+	CodeName "squeeze";
+	OverrideCodeName "squeeze";
 	CopyDotDak "/org/security.debian.org/queue/done/";
   };
 };
@@ -185,9 +172,11 @@ Suite
 SuiteMappings
 {
  "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";
 };
 
@@ -301,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;
@@ -333,8 +336,11 @@ Section
   text;
   utils;
   web;
+  vcs;
+  video;
   x11;
-  non-US;
+  xfce;
+  zope;
 };
 
 Priority
@@ -356,17 +362,12 @@ OverrideType
 
 Location
 {
-  /org/security.debian.org/ftp/dists/
-    {
-      Archive "security";
-      Type "legacy";
-    };
-
   /org/security.debian.org/ftp/pool/
     {
       Archive "security";
       Suites 
 	{
+	  OldStable;
 	  Stable;
 	  Testing;
         };