Merge from security

[dak.git] / config / debian-security / dak.conf

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 3462467be5e1ee5dcdcac4b7bdc607a5883aacca..bc978ee20a413e4f638955203f4c91bb48ce760b 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -1,10 +1,12 @@
 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 "2D230C5F";
+   SigningKeyIds "6070D3A1";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -29,14 +31,14 @@ Dinstall
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "Testing";
+   DefaultSuite "oldstable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
    StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
-Process-Unchecked
+Process-New
 {
   AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock";
 };
@@ -52,9 +54,9 @@ Queue-Report
 {
   Directories
   {
-    byhand;
-    new;
-    accepted;
+    // byhand;
+    // new;
+    unembargoed;
   };
 };
 
@@ -122,7 +124,8 @@ Suite
        {
          source;  
          all;
-         alpha; 
+         alpha;
+         amd64; 
          arm;
          hppa;
          i386;
@@ -135,12 +138,12 @@ Suite
          sparc;
        };
        Announce "dak@security.debian.org";
-       Version "3.0";
+       Version "3.1";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian 3.0 Security Updates";
-       CodeName "woody";
-       OverrideCodeName "woody";
+       Description "Debian 3.1 Security Updates";
+       CodeName "sarge";
+       OverrideCodeName "sarge";
        CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
@@ -156,13 +159,12 @@ Suite
        {
          source;  
          all;
-         alpha;
          amd64; 
+         alpha; 
          arm;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -170,12 +172,12 @@ 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";
+       CodeName "etch";
+       OverrideCodeName "etch";
        CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
@@ -194,10 +196,10 @@ Suite
          amd64; 
          alpha; 
          arm;
+         armel;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -209,11 +211,10 @@ Suite
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian testing Security Updates";
-       CodeName "etch";
-       OverrideCodeName "etch";
+       CodeName "lenny";
+       OverrideCodeName "lenny";
        CopyDotDak "/org/security.debian.org/queue/done/";
   };
-
 };
 
 SuiteMappings
@@ -222,7 +223,7 @@ SuiteMappings
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
-  "silent-map etch-secure testing";
+  "silent-map etch-secure stable";
   "silent-map testing-security testing";
 };
 
@@ -250,6 +251,8 @@ Dir
     New "/org/security.debian.org/queue/new/";
     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/";
@@ -273,6 +276,7 @@ Architectures
   alpha "DEC Alpha";
   hppa "HP PA RISC";
   arm "ARM";
+  armel "ARM EABI";
   i386 "Intel ia32";
   ia64 "Intel ia64";
   m68k "Motorola Mc680x0";