From: Joerg Jaspert Date: Tue, 16 Jun 2009 22:16:12 +0000 (+0200) Subject: signing key X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dfcad8b764f61ff359a426bc9f7be966e5f6d9f;p=dak signing key lets drop the old and only use the new one. Signed-off-by: Joerg Jaspert --- diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index 5e816d37..cbaebce4 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -6,7 +6,7 @@ Dinstall }; SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "55BE302B 6070D3A1"; + SigningKeyIds "55BE302B"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; diff --git a/config/debian/common b/config/debian/common index 9bc417b7..599f8dc5 100644 --- a/config/debian/common +++ b/config/debian/common @@ -33,7 +33,7 @@ function make_buildd_dir () { cd ${incoming} rm -f buildd/Release* apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd incoming" -o APT::FTPArchive::Release::Architectures="${archs}" release buildd > Release - gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 6070D3A1 --detach-sign -o Release.gpg Release + gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o Release.gpg Release mv Release* buildd/. cd ${incoming} diff --git a/config/debian/dak.conf b/config/debian/dak.conf index ea5826a7..73eea304 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -7,7 +7,7 @@ Dinstall }; SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "55BE302B 6070D3A1"; + SigningKeyIds "55BE302B"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org"; MyEmailAddress "Archive Administrator "; MyAdminAddress "ftpmaster@debian.org";