diff options
| author | Michael Scherer <misc@mageia.org> | 2012-01-07 22:06:40 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-01-07 22:06:40 +0000 |
| commit | 1494c1f56ab58dfd0a71d5a8de2f74785f4e4c4d (patch) | |
| tree | 1642e4aa5472ef0054809215b656c4613b361c6b /modules/buildsystem | |
| parent | d2e93dfe9d38b35af84234491f73636b1fcc4a5b (diff) | |
| download | puppet-1494c1f56ab58dfd0a71d5a8de2f74785f4e4c4d.tar puppet-1494c1f56ab58dfd0a71d5a8de2f74785f4e4c4d.tar.gz puppet-1494c1f56ab58dfd0a71d5a8de2f74785f4e4c4d.tar.bz2 puppet-1494c1f56ab58dfd0a71d5a8de2f74785f4e4c4d.tar.xz puppet-1494c1f56ab58dfd0a71d5a8de2f74785f4e4c4d.zip | |
refactor iurt configuration ( easier to change )
Diffstat (limited to 'modules/buildsystem')
| -rw-r--r-- | modules/buildsystem/manifests/init.pp | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp index 62e2f35e..9ba4886c 100644 --- a/modules/buildsystem/manifests/init.pp +++ b/modules/buildsystem/manifests/init.pp @@ -528,34 +528,24 @@ class buildsystem { require => File["/etc/iurt"], } - file { "/etc/iurt/build/cauldron.conf": - ensure => present, - owner => $build_login, - group => $build_login, - mode => 644, - require => File["/etc/iurt/build"], - content => template("buildsystem/iurt.cauldron.conf") - } + define iurt_config() { - file { "/etc/iurt/build/1.conf": - ensure => present, - owner => $build_login, - group => $build_login, - mode => 644, - require => File["/etc/iurt/build"], - content => template("buildsystem/iurt.1.conf") + $distribution = $name + file { "/etc/iurt/build/$distribution.conf": + ensure => present, + owner => $build_login, + group => $build_login, + mode => 644, + require => File["/etc/iurt/build"], + content => template("buildsystem/iurt.$distribution.conf") + } } - file { "/etc/iurt/build/mandriva2010.1.conf": - ensure => present, - owner => $build_login, - group => $build_login, - mode => 644, - require => File["/etc/iurt/build"], - content => template("buildsystem/iurt.mandriva2010.1.conf") - } + iurt_config { "1": } + iurt_config { "mandriva2010.1": } + iurt_config { "cauldron": } - sudo::sudoers_config { "iurt": + sudo::sudoers_config { "iurt": content => template("buildsystem/sudoers.iurt") } } |