From: Joerg Jaspert Date: Sun, 19 Sep 2010 19:48:40 +0000 (+0200) Subject: Move signingkeyds into database X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=6222ffd3aaf63095614f5ec232bc40571c99c68b Move signingkeyds into database Signed-off-by: Joerg Jaspert --- diff --git a/config/backports/dak.conf b/config/backports/dak.conf index 993cb80d..bfdbc8b9 100644 --- a/config/backports/dak.conf +++ b/config/backports/dak.conf @@ -9,7 +9,6 @@ Dinstall // Note: Key must be without a passphrase or it wont work automagically! SigningKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "55BE302B"; SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org"; MyEmailAddress "backports.debian.org archive Installer "; MyAdminAddress "ftpmaster@backports.debian.org"; diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 6447388e..192a039b 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -6,7 +6,6 @@ Dinstall }; 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"; MyEmailAddress "Debian FTP Masters "; diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 04627fc4..5d7f007b 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -371,10 +371,7 @@ def main (): keyring += " --keyring \"%s\"" % Cnf["Dinstall::SigningPubKeyring"] arguments = "--no-options --batch --no-tty --armour" - if Cnf.has_key("Dinstall::SigningKeyIds"): - signkeyids = Cnf["Dinstall::SigningKeyIds"].split() - else: - signkeyids = [""] + signkeyids=Cnf.signingkeyids.split() dest = Cnf["Dir::Root"] + tree + "/Release.gpg" if os.path.exists(dest): diff --git a/daklib/config.py b/daklib/config.py old mode 100644 new mode 100755 index aad28d8a..1c3f92ba --- a/daklib/config.py +++ b/daklib/config.py @@ -107,7 +107,9 @@ class Config(object): Of course, what the values do is another matter """ for field in [('db_revision', None, int), - ('defaultsuitename', 'unstable', str)]: + ('defaultsuitename', 'unstable', str), + ('signingkeyids', '', str) + ]: setattr(self, 'get_%s' % field[0], lambda x=None: self.get_db_value(field[0], field[1], field[2])) setattr(Config, '%s' % field[0], property(fget=getattr(self, 'get_%s' % field[0])))