summaryrefslogtreecommitdiff
path: root/manifests/client.pp
diff options
context:
space:
mode:
authormh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>2008-06-13 20:02:35 +0000
committermh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>2008-06-13 20:02:35 +0000
commit4f8fbfcc736d02ec0528b0df571d5d4a458c261e (patch)
tree9d24e887cccc04e27a1d41c1fb1b830451b30327 /manifests/client.pp
parent2c530ac300a57c54ce55dce73481693f93cc6e38 (diff)
Merge commit 'puzzle/development'
git-svn-id: https://svn/ipuppet/trunk/modules/munin@1600 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
Diffstat (limited to 'manifests/client.pp')
-rw-r--r--manifests/client.pp5
1 files changed, 5 insertions, 0 deletions
diff --git a/manifests/client.pp b/manifests/client.pp
index 8305bf0..59b6980 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -51,6 +51,7 @@ class munin::client::base {
package { "munin-node": ensure => installed }
service { "munin-node":
ensure => running,
+ enable => true,
hasstatus => true,
hasrestart => true,
require => Package[munin-node],
@@ -59,6 +60,10 @@ class munin::client::base {
ensure => directory,
mode => 0755, owner => root, group => 0;
}
+ $real_munin_allow = $munin_allow ? {
+ '' => '127.0.0.1',
+ default => $munin_allow
+ }
file {"/etc/munin/munin-node.conf":
content => template("munin/munin-node.conf.$operatingsystem"),
mode => 0644, owner => root, group => 0,