diff options
| author | Michael Scherer <misc@mageia.org> | 2012-01-08 13:45:11 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-01-08 13:45:11 +0000 |
| commit | 72e9a0382137b1a726b36ea6814ee89433ca0842 (patch) | |
| tree | 67aafc18a71171434fb6b4da89cf7768fe188d52 /modules | |
| parent | 3c3ab4824a84e8f3b10eeadedea290a7788f4fee (diff) | |
| download | puppet-72e9a0382137b1a726b36ea6814ee89433ca0842.tar puppet-72e9a0382137b1a726b36ea6814ee89433ca0842.tar.gz puppet-72e9a0382137b1a726b36ea6814ee89433ca0842.tar.bz2 puppet-72e9a0382137b1a726b36ea6814ee89433ca0842.tar.xz puppet-72e9a0382137b1a726b36ea6814ee89433ca0842.zip | |
do not prefix login with signbot_, clearer this way
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/buildsystem/manifests/signbot.pp | 8 | ||||
| -rw-r--r-- | modules/buildsystem/templates/signbot/sudoers.signpackage | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/buildsystem/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp index f832cc30..7b69a17f 100644 --- a/modules/buildsystem/manifests/signbot.pp +++ b/modules/buildsystem/manifests/signbot.pp @@ -1,14 +1,14 @@ class buildsystem { class signbot { - $sign_login = "signbot" - $sign_home_dir = "/var/lib/$sign_login" + $login = "signbot" + $sign_home_dir = "/var/lib/$login" $sign_keydir = "$sign_home_dir/keys" # FIXME: maybe keyid should be defined at an other place $keyid = "80420F66" # FIXME refactor with base class ( once variables are placed in a separate module ) $sched_login = "schedbot" - sshuser { $sign_login: + sshuser { $login: homedir => $sign_home_dir, comment => "System user used to sign packages", groups => [$sched_login], @@ -18,7 +18,7 @@ class buildsystem { email => "packages@$domain", #FIXME there should be a variable somewhere to change the name of the distribution key_name => 'Mageia Packages', - login => $sign_login, + login => $login, batchdir => "$sign_home_dir/batches", keydir => $sign_keydir, } diff --git a/modules/buildsystem/templates/signbot/sudoers.signpackage b/modules/buildsystem/templates/signbot/sudoers.signpackage index 2322c186..19cacb0b 100644 --- a/modules/buildsystem/templates/signbot/sudoers.signpackage +++ b/modules/buildsystem/templates/signbot/sudoers.signpackage @@ -1,2 +1,2 @@ -<%= sched_login %> ALL =(<%= sign_login %>) NOPASSWD: /usr/bin/mga-signpackage -<%= sched_login %> ALL =(<%= sign_login %>) NOPASSWD: /usr/local/bin/sign-check-package +<%= sched_login %> ALL =(<%= login %>) NOPASSWD: /usr/bin/mga-signpackage +<%= sched_login %> ALL =(<%= login %>) NOPASSWD: /usr/local/bin/sign-check-package |