From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 11 Aug 2008 03:44:14 +0000 (+0200)
Subject: Damn oldtimers
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37dd94bcc371388dd672d32de94992956dfcf38a;p=dak

Damn oldtimers
---

diff --git a/ChangeLog b/ChangeLog
index 554dc551..900a806f 100644
--- 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 4959d445..7b7f5e8e 100644
--- 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";
   };