From ebfde169e0ef4fc749cd6804e707103fab7dbf78 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 22 Dec 2009 19:50:28 -0500 Subject: take out the removal of the postfix_mailvolume munin plugin. I do not see what the bug is, and this interferes with local installation of the plugin (causes duplicate definitions) --- manifests/client/debian.pp | 2 -- 1 file changed, 2 deletions(-) (limited to 'manifests/client/debian.pp') diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index a6d677e..7b8b5a7 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -9,7 +9,5 @@ class munin::client::debian inherits munin::client::package { File["/etc/munin/munin-node.conf"]{ content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"), } - # workaround bug in munin_node_configure - plugin { "postfix_mailvolume": ensure => absent } include munin::plugins::debian } -- cgit v1.2.3 From 511afffde2c5375fd685133f6c697c3ffeaaed8b Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 22 Dec 2009 19:59:02 -0500 Subject: indentation fixups, using the emacs/vim modes for standardization --- manifests/client/debian.pp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'manifests/client/debian.pp') diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index 7b8b5a7..0bc0414 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -1,13 +1,13 @@ class munin::client::debian inherits munin::client::package { - # the plugin will need that - package { "iproute": ensure => installed } - - Service["munin-node"]{ - # sarge's munin-node init script has no status - hasstatus => $lsbdistcodename ? { sarge => false, default => true } - } - File["/etc/munin/munin-node.conf"]{ - content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"), - } - include munin::plugins::debian + # the plugin will need that + package { "iproute": ensure => installed } + + Service["munin-node"]{ + # sarge's munin-node init script has no status + hasstatus => $lsbdistcodename ? { sarge => false, default => true } + } + File["/etc/munin/munin-node.conf"]{ + content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"), + } + include munin::plugins::debian } -- cgit v1.2.3 From ed86ae3ba62c53f480047ac8dd0488ef84878fa2 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 22 Dec 2009 20:00:51 -0500 Subject: we may have iproute installed elsewhere, by doing it in the munin module, we risk duplicate definitions. this commit fixes that by doing a check to see if it is already defined elsewhere, and if it is not, then it installs the package --- manifests/client/debian.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'manifests/client/debian.pp') diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index 0bc0414..8dfa35f 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -1,6 +1,8 @@ class munin::client::debian inherits munin::client::package { # the plugin will need that - package { "iproute": ensure => installed } + if !defined(Package["iproute"]) { + package { "iproute": ensure => installed } + } Service["munin-node"]{ # sarge's munin-node init script has no status -- cgit v1.2.3 From f868f9fbb4ab6eae2a49212cd7734bda455e812d Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 22 Dec 2009 20:17:16 -0500 Subject: Revert "take out the removal of the postfix_mailvolume munin plugin. I do not see what the bug is, and this interferes with local installation of the plugin (causes duplicate definitions)" It looks like the reason this is here is because on a default debian install, without postfix installed, this postfix munin module is activated, leading to empty graphs. So rather that leave non-postfix people in this situation, we can instead leave this in and the class can be overridden locally. This reverts commit ebfde169e0ef4fc749cd6804e707103fab7dbf78. Conflicts: manifests/client/debian.pp --- manifests/client/debian.pp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'manifests/client/debian.pp') diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index 8dfa35f..f7df8d5 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -12,4 +12,8 @@ class munin::client::debian inherits munin::client::package { content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"), } include munin::plugins::debian + + # workaround bug in munin_node_configure + plugin { "postfix_mailvolume": ensure => absent } + include munin::plugins::debian } -- cgit v1.2.3 From d4df3117855d985402106e4104b87b6cb73a05c1 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 22 Dec 2009 20:55:27 -0500 Subject: remove duplicated include of plugins --- manifests/client/debian.pp | 1 - 1 file changed, 1 deletion(-) (limited to 'manifests/client/debian.pp') diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index f7df8d5..bd0fad5 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -11,7 +11,6 @@ class munin::client::debian inherits munin::client::package { File["/etc/munin/munin-node.conf"]{ content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"), } - include munin::plugins::debian # workaround bug in munin_node_configure plugin { "postfix_mailvolume": ensure => absent } -- cgit v1.2.3 From 74f66a8e77b153552ef52efee03187320e1ce877 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 10 Dec 2010 16:48:01 -0500 Subject: standardize formatting --- manifests/client/debian.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'manifests/client/debian.pp') diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index bd0fad5..e75f484 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -1,13 +1,15 @@ class munin::client::debian inherits munin::client::package { + # the plugin will need that if !defined(Package["iproute"]) { package { "iproute": ensure => installed } - } + } Service["munin-node"]{ # sarge's munin-node init script has no status hasstatus => $lsbdistcodename ? { sarge => false, default => true } } + File["/etc/munin/munin-node.conf"]{ content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"), } -- cgit v1.2.3