diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2012-12-11 11:33:34 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2012-12-11 11:33:34 +0000 |
| commit | 813b410e0586243667434a9943e171276d740030 (patch) | |
| tree | 841e3f8f87ec53a5df017b71c75de7d264a42f6b /modules/buildsystem/manifests/signbot.pp | |
| parent | 1432399b47a47dc2a026c01755aa696f37997a15 (diff) | |
| download | puppet-813b410e0586243667434a9943e171276d740030.tar puppet-813b410e0586243667434a9943e171276d740030.tar.gz puppet-813b410e0586243667434a9943e171276d740030.tar.bz2 puppet-813b410e0586243667434a9943e171276d740030.tar.xz puppet-813b410e0586243667434a9943e171276d740030.zip | |
Create buildsystem::var::signbot
All options for buildsystem::signbot are now stored in
buildsystem::var::signbot.
Diffstat (limited to 'modules/buildsystem/manifests/signbot.pp')
| -rw-r--r-- | modules/buildsystem/manifests/signbot.pp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/modules/buildsystem/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp index 5e5db5d9..5c3e222a 100644 --- a/modules/buildsystem/manifests/signbot.pp +++ b/modules/buildsystem/manifests/signbot.pp @@ -1,14 +1,10 @@ class buildsystem::signbot { include buildsystem::scheduler::var - $login = 'signbot' - $home_dir = "/var/lib/$login" - $sign_keydir = "$home_dir/keys" - # FIXME: maybe keyid should be defined at an other place - $keyid = '80420F66' + include buildsystem::var::signbot $sched_login = $buildsystem::scheduler::var::login - sshuser { $login: - homedir => $home_dir, + sshuser { $buildsystem::var::signbot::login: + homedir => $buildsystem::var::signbot::home_dir, comment => 'System user used to sign packages', groups => [$sched_login], } @@ -18,9 +14,9 @@ class buildsystem::signbot { #FIXME there should be a variable somewhere to change # the name of the distribution key_name => 'Mageia Packages', - login => $login, - batchdir => "$home_dir/batches", - keydir => $sign_keydir, + login => $buildsystem::var::signbot::login, + batchdir => "${buildsystem::var::signbot::home_dir}/batches", + keydir => $buildsystem::var::signbot::sign_keydir, } sudo::sudoers_config { 'signpackage': |