Merge commit 'dak-master/master'

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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index b146c637badedc8fdb914e608d353b8eae2796f1..ff74a599bf07cc5fed1f18f01b252b77b767ab34 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";
@@ -14,6 +16,7 @@ Dinstall
    PackagesServer "packages.debian.org";
    LockFile "/org/security.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
+   // GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 300;
@@ -22,20 +25,18 @@ Dinstall
    BXANotify "false";
    QueueBuildSuites
    {
-     oldstable;
      stable;
      testing;
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "Testing";
+   DefaultSuite "stable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
-   StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
-Process-Unchecked
+Process-New
 {
   AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock";
 };
@@ -51,9 +52,9 @@ Queue-Report
 {
   Directories
   {
-    byhand;
-    new;
-    accepted;
+    // byhand;
+    // new;
+    unembargoed;
   };
 };
 
@@ -109,40 +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; 
-         arm;
-         hppa;
-         i386;
-         ia64;
-         m68k;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
-       Announce "dak@security.debian.org";
-       Version "3.0";
-       Origin "Debian";
-       Label "Debian-Security";
-       Description "Debian 3.0 Security Updates";
-       CodeName "woody";
-       OverrideCodeName "woody";
-       CopyDotDak "/org/security.debian.org/queue/done/";
-  };
-
   Stable
   {
        Components 
@@ -155,13 +122,12 @@ Suite
        {
          source;  
          all;
-         alpha;
          amd64; 
+         alpha; 
          arm;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -169,12 +135,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/";
   };
 
@@ -193,10 +160,10 @@ Suite
          amd64; 
          alpha; 
          arm;
+         armel;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -208,20 +175,19 @@ Suite
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian testing Security Updates";
-       CodeName "etch";
-       OverrideCodeName "etch";
+       ValidTime 864000; // 10 days
+       CodeName "lenny";
+       OverrideCodeName "lenny";
        CopyDotDak "/org/security.debian.org/queue/done/";
   };
-
 };
 
 SuiteMappings
 {
-  "silent-map oldstable-security oldstable";
  "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";
 };
 
@@ -240,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 +216,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/";
@@ -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;
         };