Damn oldtimers

diff --git a/ChangeLog b/ChangeLog
index 554dc5512b4e1a453a9ad0f9c549aac517a691c2..900a806f120db5b5e3f6dfd23e58ae80f6476b40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-11  Joerg Jaspert  <joerg@debian.org>
+
+       * config/debian/dak.conf: Added back the pgp keyrings for now, as
+       it seems that we should keep it for a few more days, until we
+       somehow got ll those oldtimers to get a newer key into the
+       keyring. Unfortunately our logic to look for uploads done from
+       that keyring wasnt the most perfect one, so well, it is actually
+       used. Damn.
+
 2008-08-09  Joerg Jaspert  <joerg@debian.org>
 
        * config/debian/dak.conf: No longer use the pgp keyring - no

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 4959d445f7f83b401c71b3278aba36bb4e1cb14a..7b7f5e8ebe039ac4a21d62d112eb56989250db9d 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -2,6 +2,7 @@ Dinstall
 {
    GPGKeyring {
       "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; 
+      "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
       "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg";
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
@@ -183,6 +184,7 @@ Import-LDAP-Fingerprints
   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";
   };