diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:06:30 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:06:30 +0000 |
| commit | 40a95441f2fdc21eeebdee52dad83782e9e69192 (patch) | |
| tree | 3d5392fa50c63aae1a4340528efc65fe782cc5e9 /modules | |
| parent | 02004ba83701a19037e175e6b623d25ebb61f72a (diff) | |
| download | puppet-40a95441f2fdc21eeebdee52dad83782e9e69192.tar puppet-40a95441f2fdc21eeebdee52dad83782e9e69192.tar.gz puppet-40a95441f2fdc21eeebdee52dad83782e9e69192.tar.bz2 puppet-40a95441f2fdc21eeebdee52dad83782e9e69192.tar.xz puppet-40a95441f2fdc21eeebdee52dad83782e9e69192.zip | |
buildsystem::signbot: add options for gpg key infos
Add options in buildsystem::var::signbot to select GPG key email and
name.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/buildsystem/manifests/signbot.pp | 6 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/var/signbot.pp | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/modules/buildsystem/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp index 95e9f1d2..8f11840e 100644 --- a/modules/buildsystem/manifests/signbot.pp +++ b/modules/buildsystem/manifests/signbot.pp @@ -10,10 +10,8 @@ class buildsystem::signbot { } gnupg::keys{ 'packages': - email => "packages@$::domain", - #FIXME there should be a variable somewhere to change - # the name of the distribution - key_name => 'Mageia Packages', + email => $buildsystem::var::signbot::keyemail, + key_name => $buildsystem::var::signbot::keyname, login => $buildsystem::var::signbot::login, batchdir => "${buildsystem::var::signbot::home_dir}/batches", keydir => $buildsystem::var::signbot::sign_keydir, diff --git a/modules/buildsystem/manifests/var/signbot.pp b/modules/buildsystem/manifests/var/signbot.pp index 1d103631..b96a5ae1 100644 --- a/modules/buildsystem/manifests/var/signbot.pp +++ b/modules/buildsystem/manifests/var/signbot.pp @@ -1,7 +1,13 @@ # $keyid: # the key id of the gnupg key used to sign packages +# $keyemail: +# email address of the key used to sign packages +# $keyname: +# name of the key used to sign packages class buildsystem::var::signbot( - $keyid + $keyid, + $keyemail, + $keyname ) { $login = 'signbot' $home_dir = "/var/lib/$login" |