From: Ansgar Burchardt Date: Tue, 1 Jan 2013 10:00:52 +0000 (+0100) Subject: Use Squeezy key instead of the expired Lenny key. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bbc46bb933a97c90a4c36b621c7e202398e2d8d;p=dak Use Squeezy key instead of the expired Lenny key. --- diff --git a/config/backports/dinstall.functions b/config/backports/dinstall.functions index 67b40de2..06988bd5 100644 --- a/config/backports/dinstall.functions +++ b/config/backports/dinstall.functions @@ -465,7 +465,7 @@ function i18n2() { dak control-suite -l testing > wheezy dak control-suite -l unstable > sid echo "${STAMP}" > timestamp - gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o timestamp.gpg timestamp + gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o timestamp.gpg timestamp rm -f md5sum md5sum * > md5sum cd ${webdir}/ diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index b5780e04..c1b6c94e 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -3,7 +3,6 @@ Dinstall // 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"; - SigningKeyIds "55BE302B"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian FTP Masters "; MyAdminAddress "ftpmaster@debian.org"; diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index 064ba81b..8e8735bf 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -484,7 +484,7 @@ function i18n2() { dak control-suite -l ${suite} >${codename} done echo "${STAMP}" > timestamp - gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o timestamp.gpg timestamp + gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o timestamp.gpg timestamp rm -f md5sum md5sum * > md5sum cd ${webdir}/