signing key

lets drop the old and only use the new one.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 5e816d37797993ac87132b5a4c7f59590d53b8d2..cbaebce43f7c76578913db73e1b7bfe58dce934b 100644 (file)
--- 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 <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";

diff --git a/config/debian/common b/config/debian/common
index 9bc417b7bb91918fa45594847bb7d42220cda979..599f8dc55a02c517cfc3e39852a253b9c1161064 100644 (file)
--- 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 ea5826a741d851f8cf7b094c3492d2d72e374c6b..73eea304ea0f71df6d60a5acc8ffdda2b617ae00 100644 (file)
--- 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 <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";