[dak/master] Damn oldtimers
---
ChangeLog | 9 +++++++++
config/debian/dak.conf | 2 ++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 554dc55..900a806 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 4959d44..7b7f5e8 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";
};
--
1.5.6.3
Reply to: