diff options
| author | Pierre-Yves Ritschard <pyr@milestonelab.com> | 2011-02-03 17:58:09 +0000 |
|---|---|---|
| committer | R.I.Pienaar <rip@devco.net> | 2011-02-03 18:01:36 +0000 |
| commit | 031bf261289dcbb32e63b053ed5b3a82117698c0 (patch) | |
| tree | aebbada8d2acc6f36b4141cd814b4f63df40ea56 /manifests | |
| parent | 3c46b82d09a9ce7ebf66b42b342a753e59b6d467 (diff) | |
| download | puppet-concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz puppet-concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.bz2 | |
- make the root group configurable in the concat::setup class for portability
- use sh and not bash
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/fragment.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 6 | ||||
| -rw-r--r-- | manifests/setup.pp | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/manifests/fragment.pp b/manifests/fragment.pp index 890d43a..7afc4c0 100644 --- a/manifests/fragment.pp +++ b/manifests/fragment.pp @@ -13,7 +13,7 @@ # - group Owner of the file # - backup Controls the filebucketing behavior of the final file and # see File type reference for its use. Defaults to 'puppet' -define concat::fragment($target, $content='', $source='', $order=10, $ensure = "present", $mode = 0644, $owner = root, $group = root, $backup = "puppet") { +define concat::fragment($target, $content='', $source='', $order=10, $ensure = "present", $mode = 0644, $owner = root, $group = $concat::setup::root_group, $backup = "puppet") { $safe_name = regsubst($name, '/', '_', 'G') $safe_target_name = regsubst($target, '/', '_', 'G') $concatdir = $concat::setup::concatdir diff --git a/manifests/init.pp b/manifests/init.pp index 909d7b6..3a17346 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -87,7 +87,7 @@ # ALIASES: # - The exec can notified using Exec["concat_/path/to/file"] or Exec["concat_/path/to/directory"] # - The final file can be referened as File["/path/to/file"] or File["concat_/path/to/file"] -define concat($mode = 0644, $owner = "root", $group = "root", $warn = "false", $force = "false", $backup = "puppet", $gnu = "true", $order="alpha") { +define concat($mode = 0644, $owner = "root", $group = $concat::setup::root_group, $warn = "false", $force = "false", $backup = "puppet", $gnu = "true", $order="alpha") { $safe_name = regsubst($name, '/', '_', 'G') $concatdir = $concat::setup::concatdir $version = $concat::setup::majorversion @@ -127,7 +127,7 @@ define concat($mode = 0644, $owner = "root", $group = "root", $warn = "false", $ File{ owner => root, - group => root, + group => $group, mode => $mode, backup => $backup } @@ -165,7 +165,7 @@ define concat($mode = 0644, $owner = "root", $group = "root", $warn = "false", $ exec{"concat_${name}": user => root, - group => root, + group => $group, notify => File[$name], subscribe => File[$fragdir], alias => "concat_${fragdir}", diff --git a/manifests/setup.pp b/manifests/setup.pp index 9676fb6..77ba47f 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -13,12 +13,13 @@ # # It also copies out the concatfragments.sh file to /usr/local/bin class concat::setup { + $root_group = 0 $concatdir = "/var/lib/puppet/concat" $majorversion = regsubst($puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1') file{"/usr/local/bin/concatfragments.sh": owner => root, - group => root, + group => $root_group, mode => 755, source => $majorversion ? { 24 => "puppet:///concat/concatfragments.sh", @@ -28,7 +29,7 @@ class concat::setup { $concatdir: ensure => directory, owner => root, - group => root, + group => $root_group, mode => 755; } } |