Remove GPGKeyring - it's no longer used

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 82af9cadace0cda0d295919de53dda997abb3795..d019f8774a425ea45a45d0e7453f2fa4e70bfc19 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -1,10 +1,5 @@
 Dinstall
 {
-   // Both need to be defined at the moment, but they can point to the
-   // same file.
-   GPGKeyring {
-      "/srv/backports-master.debian.org/keyrings/keyring.gpg";
-   };
    // To sign the release files. Adjust the keyid!
    // Note: Key must be without a passphrase or it wont work automagically!
    SigningKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 6c4c5c6b852bb4b1d05d949ecc3d04c6b4cf6bbb..8eb2b98e6d221b5256f68550d1f95617c9b4c81d 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -1,8 +1,5 @@
 Dinstall
 {
-   GPGKeyring {
-     "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-   };
    // was non-us.d.o path before
    SigningKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 89ca01e48322a11422a0cd3826db53433199ea8c..6b5e17a9db52dc157b4f063d76b55333775e3099 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,9 +1,5 @@
 Dinstall
 {
-   GPGKeyring {
-      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-      "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
-   };
    SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
 //   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";