diff options
| author | mh <mh@immerda.ch> | 2012-06-05 19:34:51 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-05 19:34:51 -0300 |
| commit | 0fe7552f256f0b1508cc5d3cab952eb93bee6811 (patch) | |
| tree | 9769eab5ea4b9bf6f49c2c11d9a9b9e1736361c9 /manifests/plugin | |
| parent | 3db1ca8f85b28978a3a9c09de3551f536b1375a6 (diff) | |
new style for 2.7
Diffstat (limited to 'manifests/plugin')
| -rw-r--r-- | manifests/plugin/deploy.pp | 6 | ||||
| -rw-r--r-- | manifests/plugin/scriptpaths.pp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp index 96fea41..3f2a1a4 100644 --- a/manifests/plugin/deploy.pp +++ b/manifests/plugin/deploy.pp @@ -5,7 +5,7 @@ define nagios::plugin::deploy($source = '', $ensure = 'present', $config = '', $ default => $ensure } $real_source = $source ? { - '' => "nagios/plugins/$plugin_src", + '' => "nagios/plugins/${plugin_src}", default => $source } @@ -15,11 +15,11 @@ define nagios::plugin::deploy($source = '', $ensure = 'present', $config = '', $ tag => "nagios::plugin::deploy::package"; } } - + include nagios::plugin::scriptpaths file { "nagios_plugin_${name}": path => "$nagios::plugin::scriptpaths::script_path/${name}", - source => "puppet://$server/modules/$real_source", + source => "puppet:///modules/${real_source}", mode => 0755, owner => root, group => 0, require => Package[$require_package], tag => "nagios::plugin::deploy::file"; diff --git a/manifests/plugin/scriptpaths.pp b/manifests/plugin/scriptpaths.pp index 6065709..9cd4b5d 100644 --- a/manifests/plugin/scriptpaths.pp +++ b/manifests/plugin/scriptpaths.pp @@ -1,5 +1,5 @@ class nagios::plugin::scriptpaths { - case $hardwaremodel { + case $::hardwaremodel { x86_64: { $script_path = "/usr/lib64/nagios/plugins/" } default: { $script_path = "/usr/lib/nagios/plugins" } } |