From: Joerg Jaspert Date: Thu, 1 Jul 2010 21:01:25 +0000 (+0200) Subject: Merge branch 'master' into franck X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=13b7df7bec375026c6870054f20eb1743470ea19;p=dak.git Merge branch 'master' into franck * master: No more pgp keyring --- 13b7df7bec375026c6870054f20eb1743470ea19 diff --cc config/debian/dak.conf index c0a902c4,2610da38..328d5811 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@@ -2,11 -2,10 +2,10 @@@ Dinstal { GPGKeyring { "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; - "/srv/keyring.debian.org/keyrings/debian-keyring.pgp"; "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg"; }; - SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; - SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; + SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg"; + SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; SigningKeyIds "55BE302B"; // SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org"; SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";