[dak/master] keyring stuff

[Joerg Jaspert <joerg@debian.org>]

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 config/debian-security/dak.conf |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 5821a3f..42e400e 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -2,7 +2,6 @@ Dinstall
 {
    GPGKeyring {
      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-     "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
    };
    // was non-us.d.o path before
    SigningKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
@@ -59,6 +58,27 @@ Queue-Report
   };
 };
 
+Import-Keyring
+{
+  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
+    {
+      Debian-Maintainer "true";
+    };
+};
+
+Import-LDAP-Fingerprints
+{
+  LDAPDn "ou=users,dc=debian,dc=org";
+  LDAPServer "db.debian.org";
+  ExtraKeyrings
+  {
+    "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
+    "/srv/keyring.debian.org/keyrings/removed-keys.gpg";
+    "/srv/keyring.debian.org/keyrings/extra-keys.pgp";
+  };
+  KeyServer "wwwkeys.eu.pgp.net";
+};
+
 Clean-Queues
 {
   Options
-- 
1.5.6.5