diff options
author | Nicolas Vigier <boklm@mageia.org> | 2012-12-11 11:33:36 +0000 |
---|---|---|
committer | Nicolas Vigier <boklm@mageia.org> | 2012-12-11 11:33:36 +0000 |
commit | 3c51f27dd70770263c5bd6793a41977fea86cab3 (patch) | |
tree | 5c74656e58611b2b922453409852e9eeaba092ae | |
parent | 813b410e0586243667434a9943e171276d740030 (diff) | |
download | puppet-3c51f27dd70770263c5bd6793a41977fea86cab3.tar puppet-3c51f27dd70770263c5bd6793a41977fea86cab3.tar.gz puppet-3c51f27dd70770263c5bd6793a41977fea86cab3.tar.bz2 puppet-3c51f27dd70770263c5bd6793a41977fea86cab3.tar.xz puppet-3c51f27dd70770263c5bd6793a41977fea86cab3.zip |
buildsystem::signbot: set value of $keyid in mga_buildsystem
The default value of $keyid has been removed from
buildsystem::var::signbot and is now defined by mga_buildsystem::config.
-rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 3 | ||||
-rw-r--r-- | modules/buildsystem/manifests/var/signbot.pp | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 4ceef5dc..4f26b7cd 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -1,2 +1,5 @@ class mga_buildsystem::config { + class { 'buildsystem::var::signbot': + keyid => '80420F66', + } } diff --git a/modules/buildsystem/manifests/var/signbot.pp b/modules/buildsystem/manifests/var/signbot.pp index f9fac04f..1d103631 100644 --- a/modules/buildsystem/manifests/var/signbot.pp +++ b/modules/buildsystem/manifests/var/signbot.pp @@ -1,4 +1,8 @@ -class buildsystem::var::signbot($keyid = '80420F66') { +# $keyid: +# the key id of the gnupg key used to sign packages +class buildsystem::var::signbot( + $keyid +) { $login = 'signbot' $home_dir = "/var/lib/$login" $sign_keydir = "$home_dir/keys" |