aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-01-08 14:47:00 +0000
committerMichael Scherer <misc@mageia.org>2012-01-08 14:47:00 +0000
commitb00e5eabd90a8dee1278c30628e976af95bb562b (patch)
tree311451920887eeb8d02cfffa7a54f0754a670ca1 /modules/buildsystem
parent5bb677dcca25b78ce5568beb0e0c7aa88831d58f (diff)
downloadpuppet-b00e5eabd90a8dee1278c30628e976af95bb562b.tar
puppet-b00e5eabd90a8dee1278c30628e976af95bb562b.tar.gz
puppet-b00e5eabd90a8dee1278c30628e976af95bb562b.tar.bz2
puppet-b00e5eabd90a8dee1278c30628e976af95bb562b.tar.xz
puppet-b00e5eabd90a8dee1278c30628e976af95bb562b.zip
small refactoring of binrepos module
Diffstat (limited to 'modules/buildsystem')
-rw-r--r--modules/buildsystem/manifests/init.pp37
1 files changed, 10 insertions, 27 deletions
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index a46dcd63..568eb7a1 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -137,35 +137,18 @@ class buildsystem {
home => "$binrepo_homedir",
}
- file { $binrepodir:
- ensure => directory,
- owner => $binrepo_login,
- group => $binrepo_login,
- mode => 755,
- }
-
- file { $uploadinfosdir:
- ensure => directory,
- owner => $binrepo_login,
- group => $binrepo_login,
- mode => 755,
- }
+ file { [$binrepodir, $uploadinfosdir]:
+ ensure => directory,
+ owner => $binrepo_login,
+ }
- file { $uploadbinpath:
- ensure => present,
- owner => root,
- group => root,
- mode => 755,
- content => template('buildsystem/upload-bin'),
- }
+ local_script { "upload-bin":
+ content => template('buildsystem/upload-bin'),
+ }
- file { $uploadbinpathwrapper:
- ensure => present,
- owner => root,
- group => root,
- mode => 755,
- content => template('buildsystem/wrapper.upload-bin'),
- }
+ local_script { "wrapper.upload-bin":
+ content => template('buildsystem/wrapper.upload-bin'),
+ }
sudo::sudoers_config { "binrepo":
content => template("buildsystem/sudoers.binrepo")