diff options
author | mh <mh@immerda.ch> | 2012-04-10 14:57:32 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-04-10 14:57:32 +0200 |
commit | f06092dda9280b373f7a55dd11b650c729059151 (patch) | |
tree | 44de4b06a7c695249a647cc71d515031568cf627 /manifests/plugins | |
parent | f2a0d2623b36e6105f31e51d99cbd349adaa30d7 (diff) | |
parent | c49190c6c6cae7c7f854920667717dad2e3adb27 (diff) |
merge from github
Diffstat (limited to 'manifests/plugins')
-rw-r--r-- | manifests/plugins/base.pp | 2 | ||||
-rw-r--r-- | manifests/plugins/interfaces.pp | 2 | ||||
-rw-r--r-- | manifests/plugins/physical.pp | 2 | ||||
-rw-r--r-- | manifests/plugins/setup.pp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/manifests/plugins/base.pp b/manifests/plugins/base.pp index 007579c..972a674 100644 --- a/manifests/plugins/base.pp +++ b/manifests/plugins/base.pp @@ -7,7 +7,7 @@ class munin::plugins::base { } include munin::plugins::interfaces - case $kernel { + case $::kernel { openbsd: { include munin::plugins::openbsd } linux: { case $vserver { diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp index 18a713b..b2c448b 100644 --- a/manifests/plugins/interfaces.pp +++ b/manifests/plugins/interfaces.pp @@ -5,7 +5,7 @@ class munin::plugins::interfaces { munin::plugin { $ifs: ensure => "if_"; } - case $operatingsystem { + case $::operatingsystem { openbsd: { $if_errs = regsubst(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1") munin::plugin{ diff --git a/manifests/plugins/physical.pp b/manifests/plugins/physical.pp index ac050a5..a1c27a7 100644 --- a/manifests/plugins/physical.pp +++ b/manifests/plugins/physical.pp @@ -1,5 +1,5 @@ class munin::plugins::physical { - case $kernel { + case $::kernel { linux: { munin::plugin { iostat: } } } } diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp index c88f9e0..caf2e28 100644 --- a/manifests/plugins/setup.pp +++ b/manifests/plugins/setup.pp @@ -11,7 +11,7 @@ class munin::plugins::setup { mode => 0644, owner => root, group => 0, notify => Service['munin-node'], } - case $kernel { + case $::kernel { openbsd: { File['/etc/munin/plugin-conf.d/munin-node']{ before => File['/var/run/munin'], |