Make GPGKeyring a list of keyrings; drop PGPKeyring.

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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index d4c271bbdc32b88d214158ea7dfb78fef4c2c9f0..0af66820a997927b856dac7637840ae81767c08e 100644 (file)
--- 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 "2D230C5F";
@@ -14,7 +16,6 @@ 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;
@@ -205,10 +206,10 @@ Suite
          sparc;
        };
        Announce "dak@security.debian.org";
-       Version "x.y";
+       Version "";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian x.y Security Updates";
+       Description "Debian testing Security Updates";
        CodeName "etch";
        OverrideCodeName "etch";
        CopyDotDak "/org/security.debian.org/queue/done/";
@@ -222,6 +223,7 @@ SuiteMappings
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
+  "silent-map etch-secure testing";
   "silent-map testing-security testing";
 };