diff options
author | David Schmitt <david@schmitt.edv-bus.at> | 2009-06-03 11:11:45 +0200 |
---|---|---|
committer | David Schmitt <david@schmitt.edv-bus.at> | 2009-06-03 11:11:45 +0200 |
commit | c0abb341bfdd1061c85d0349b9a880de6047728f (patch) | |
tree | cee1132029f056c10d9373de3955421f63bac4a2 /templates | |
parent | c223993eba487cc24425890b2b9b6abd2f6c4d35 (diff) |
use cidr_allow in lenny and newer
This change keeps munin_allow for etch and feisty, since I don't know whether
cidr_allow is already possible there. Everyone else should change to the much
nicer CIDR notation of cidr_allow.
You can use an array to specify multiple rules.
Diffstat (limited to 'templates')
-rw-r--r--[l---------] | templates/munin-node.conf.Debian.lenny | 44 | ||||
l--------- | templates/munin-node.conf.Debian.sid | 2 | ||||
l--------- | templates/munin-node.conf.Debian.squeeze | 1 |
3 files changed, 45 insertions, 2 deletions
diff --git a/templates/munin-node.conf.Debian.lenny b/templates/munin-node.conf.Debian.lenny index e0646b9..07f4980 120000..100644 --- a/templates/munin-node.conf.Debian.lenny +++ b/templates/munin-node.conf.Debian.lenny @@ -1 +1,43 @@ -munin-node.conf.Debian.etch
\ No newline at end of file +########## +########## Managed by puppet +########## + +log_level 4 +log_file /var/log/munin/munin-node.log +pid_file /var/run/munin/munin-node.pid +background 1 +setseid 1 + +# Which host/port to bind to; +host <%= munin_host_real %> +port <%= munin_port_real %> +user root +group root +setsid yes + +# Regexps for files to ignore + +ignore_file ~$ +ignore_file \.bak$ +ignore_file %$ +ignore_file \.dpkg-(tmp|new|old|dist)$ +ignore_file \.rpm(save|new)$ + +# Set this if the client doesn't report the correct hostname when +# telnetting to localhost, port 4949 +# +#host_name localhost.localdomain +host_name <%= fqdn %> + +# A list of addresses that are allowed to connect. +<% +if ! munin_cidr_allow.is_a?(Array) then + allows = [ munin_cidr_allow ] +else + allows = munin_cidr_allow +end + +allows.each do |cidr| +-%> +cidr_allow <%= cidr %> +<% end -%> diff --git a/templates/munin-node.conf.Debian.sid b/templates/munin-node.conf.Debian.sid index e0646b9..6b8d690 120000 --- a/templates/munin-node.conf.Debian.sid +++ b/templates/munin-node.conf.Debian.sid @@ -1 +1 @@ -munin-node.conf.Debian.etch
\ No newline at end of file +munin-node.conf.Debian.lenny
\ No newline at end of file diff --git a/templates/munin-node.conf.Debian.squeeze b/templates/munin-node.conf.Debian.squeeze new file mode 120000 index 0000000..6b8d690 --- /dev/null +++ b/templates/munin-node.conf.Debian.squeeze @@ -0,0 +1 @@ +munin-node.conf.Debian.lenny
\ No newline at end of file |