summaryrefslogtreecommitdiff
path: root/manifests/plugin
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2012-04-10 14:57:32 +0200
committermh <mh@immerda.ch>2012-04-10 14:57:32 +0200
commitf06092dda9280b373f7a55dd11b650c729059151 (patch)
tree44de4b06a7c695249a647cc71d515031568cf627 /manifests/plugin
parentf2a0d2623b36e6105f31e51d99cbd349adaa30d7 (diff)
parentc49190c6c6cae7c7f854920667717dad2e3adb27 (diff)
merge from github
Diffstat (limited to 'manifests/plugin')
-rw-r--r--manifests/plugin/deploy.pp1
-rw-r--r--manifests/plugin/scriptpaths.pp4
2 files changed, 2 insertions, 3 deletions
diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp
index 094b490..5003153 100644
--- a/manifests/plugin/deploy.pp
+++ b/manifests/plugin/deploy.pp
@@ -15,7 +15,6 @@ define munin::plugin::deploy($source = '', $ensure = 'present', $config = '') {
mode => 0755, owner => root, group => 0;
}
-
if ($::selinux == 'true') and (($::operatingsystem != 'CentOS') or ($::operatingsystem == 'CentOS' and $::lsbmajdistrelease != '5')){
File["munin_plugin_${name}"]{
seltype => 'munin_exec_t',
diff --git a/manifests/plugin/scriptpaths.pp b/manifests/plugin/scriptpaths.pp
index 164a17e..f4bd39b 100644
--- a/manifests/plugin/scriptpaths.pp
+++ b/manifests/plugin/scriptpaths.pp
@@ -1,9 +1,9 @@
class munin::plugin::scriptpaths {
- case $operatingsystem {
+ case $::operatingsystem {
gentoo: { $script_path = "/usr/libexec/munin/plugins" }
debian: { $script_path = "/usr/share/munin/plugins" }
centos: { $script_path = "/usr/share/munin/plugins" }
- openbsd: { $script_path = $operatingsystemrelease ? {
+ openbsd: { $script_path = $::operatingsystemrelease ? {
'4.3' => '/opt/munin/lib/plugins/',
default => '/usr/local/libexec/munin/plugins/'
} }