From 61eb4e708c28e6ee5ffa8b7fbbd6c3e0ad4887fc Mon Sep 17 00:00:00 2001 From: Mark Hymers Date: Wed, 27 Jul 2011 19:45:20 +0100 Subject: [PATCH] Remove GPGKeyring - it's no longer used Signed-off-by: Mark Hymers --- config/backports/dak.conf | 5 ----- config/debian-security/dak.conf | 3 --- config/debian/dak.conf | 4 ---- 3 files changed, 12 deletions(-) diff --git a/config/backports/dak.conf b/config/backports/dak.conf index 82af9cad..d019f877 100644 --- 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 6c4c5c6b..8eb2b98e 100644 --- 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 89ca01e4..6b5e17a9 100644 --- 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"; -- 2.39.2