summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2015-05-07 15:07:38 +0000
committerMicah <micah@riseup.net>2015-05-07 15:07:38 +0000
commit9b8f961d2f5d805067b037222ddf1011fe972f50 (patch)
tree5075e03634e201ea190904886052ce530abe9eca /manifests
parent12a297b764df59c5f6b611c2f0673531b7e98ee2 (diff)
parent4bd026dfedc07de63ae5bd8c7ef86eaa70bb6390 (diff)
Merge branch 'plugin_path' into 'master'
Plugin path Avoid using lib64 in the path for x86_64 architecture when using debian. this path is not available anymore starting with debian wheezy. Then lint the file to make it easier to read / maintain. This is a followup of https://labs.riseup.net/code/issues/4237 See merge request !7
Diffstat (limited to 'manifests')
-rw-r--r--manifests/plugin.pp34
1 files changed, 21 insertions, 13 deletions
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index d32606b..f2e4ed2 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -1,19 +1,27 @@
define nagios::plugin(
- $source = 'absent',
- $ensure = present
+ $source = 'absent',
+ $ensure = present
){
+ if $::hardwaremodel == 'x86_64' and $::operatingsystem != 'debian' {
+ $real_path = "/usr/lib64/nagios/plugins/${name}"
+ }
+ else {
+ $real_path = "/usr/lib/nagios/plugins/${name}"
+ }
+
+ $real_source = $source ? {
+ 'absent' => "puppet:///modules/nagios/plugins/${name}",
+ default => "puppet:///modules/${source}"
+ }
+
file{$name:
- path => $::hardwaremodel ? {
- 'x86_64' => "/usr/lib64/nagios/plugins/${name}",
- default => "/usr/lib/nagios/plugins/${name}",
- },
- ensure => $ensure,
- source => $source ? {
- 'absent' => "puppet:///modules/nagios/plugins/${name}",
- default => "puppet:///modules/${source}"
- },
- tag => 'nagios_plugin',
+ ensure => $ensure,
+ path => $real_path,
+ source => $real_source,
+ tag => 'nagios_plugin',
require => Package['nagios-plugins'],
- owner => root, group => 0, mode => 0755;
+ owner => 'root',
+ group => 0,
+ mode => '0755';
}
}