summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/client/debian.pp9
-rw-r--r--manifests/host.pp4
-rw-r--r--manifests/plugin.pp2
-rw-r--r--manifests/plugin/deploy.pp2
4 files changed, 4 insertions, 13 deletions
diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp
index f1bbb3c..49ee567 100644
--- a/manifests/client/debian.pp
+++ b/manifests/client/debian.pp
@@ -3,15 +3,6 @@ class munin::client::debian inherits munin::client::base {
# the plugin will need that
ensure_packages(['iproute'])
- $hasstatus = $::lsbdistcodename ? {
- sarge => false,
- default => true
- }
-
- Service['munin-node']{
- # sarge's munin-node init script has no status
- hasstatus => $hasstatus
- }
# workaround bug in munin_node_configure
plugin { 'postfix_mailvolume': ensure => absent }
include munin::plugins::debian
diff --git a/manifests/host.pp b/manifests/host.pp
index e666c3d..55e28bf 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -15,10 +15,10 @@ class munin::host(
concat::fragment{'munin.conf.header':
target => '/etc/munin/munin.conf',
source => [ "puppet:///modules/site_munin/config/host/${::fqdn}/munin.conf.header",
- "puppet:///modules/site_munin/config/host/munin.conf.header.${::operatingsystem}.${::lsbdistcodename}",
+ "puppet:///modules/site_munin/config/host/munin.conf.header.${::operatingsystem}.${::operatingsystemmajrelease}",
"puppet:///modules/site_munin/config/host/munin.conf.header.${::operatingsystem}",
'puppet:///modules/site_munin/config/host/munin.conf.header',
- "puppet:///modules/munin/config/host/munin.conf.header.${::operatingsystem}.${::lsbdistcodename}",
+ "puppet:///modules/munin/config/host/munin.conf.header.${::operatingsystem}.${::operatingsystemmajrelease}",
"puppet:///modules/munin/config/host/munin.conf.header.${::operatingsystem}",
'puppet:///modules/munin/config/host/munin.conf.header' ],
order => 05,
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 37d0077..50b861b 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -27,7 +27,7 @@ define munin::plugin (
target =>"${real_script_path}/${plugin_src}",
notify => Service['munin-node'];
}
- if (str2bool($::selinux) == true) and (($::operatingsystem != 'CentOS') or ($::operatingsystem == 'CentOS' and $::lsbmajdistrelease != '5')){
+ if (str2bool($::selinux) == true) and (($::operatingsystem != 'CentOS') or ($::operatingsystem == 'CentOS' and $::operatingsystemmajrelease != '5')){
File["/etc/munin/plugins/${name}"]{
seltype => 'munin_etc_t',
}
diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp
index 461a218..2ffd92e 100644
--- a/manifests/plugin/deploy.pp
+++ b/manifests/plugin/deploy.pp
@@ -24,7 +24,7 @@ define munin::plugin::deploy(
mode => '0755';
}
- if (str2bool($::selinux) == true) and (($::operatingsystem != 'CentOS') or ($::operatingsystem == 'CentOS' and $::lsbmajdistrelease > '5')){
+ if (str2bool($::selinux) == true) and (($::operatingsystem != 'CentOS') or ($::operatingsystem == 'CentOS' and $::operatingsystemmajrelease > '5')){
File["munin_plugin_${name}"]{
seltype => $seltype,
}