summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-12-22 20:17:16 -0500
committerMicah Anderson <micah@riseup.net>2009-12-22 20:17:16 -0500
commitf868f9fbb4ab6eae2a49212cd7734bda455e812d (patch)
tree7e67ed3d081ec37585ca3630ef11d50cbca0f40f
parented86ae3ba62c53f480047ac8dd0488ef84878fa2 (diff)
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
-rw-r--r--manifests/client/debian.pp4
1 files changed, 4 insertions, 0 deletions
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
}