diff options
| author | Micah Anderson <micah@riseup.net> | 2009-12-22 19:29:23 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-12-22 19:29:23 -0500 |
| commit | 42c94b4fad526b25852c7bcaf053f441bac38c9e (patch) | |
| tree | 89a8da279ba7190a350ade72bc52cda90362c4b7 /templates/munin-node.conf.Debian.lenny | |
| parent | 577ff440b791ab67de77b20440b5e385fe1c9572 (diff) | |
| parent | 76352415fec5c2ab6975e3a8843dd4983f7cae6a (diff) | |
Merge commit '76352415fec5c2ab6975e3a8843dd4983f7cae6a'
Conflicts:
README
lib/facter/acpi_available.rb
lib/facter/interfaces.rb
lib/facter/munin_interfaces.rb
manifests/client.pp
manifests/host.pp
manifests/init.pp
manifests/plugin.pp
plugins/facter/interfaces.rb
templates/defaultclient.erb
templates/munin-node.conf.Debian.lenny
Diffstat (limited to 'templates/munin-node.conf.Debian.lenny')
| -rw-r--r-- | templates/munin-node.conf.Debian.lenny | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/templates/munin-node.conf.Debian.lenny b/templates/munin-node.conf.Debian.lenny index 07f4980..56da89d 100644 --- a/templates/munin-node.conf.Debian.lenny +++ b/templates/munin-node.conf.Debian.lenny @@ -29,15 +29,11 @@ ignore_file \.rpm(save|new)$ #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 %> +# A list of addresses that are allowed to connect. This must be a +# regular expression, due to brain damage in Net::Server, which +# doesn't understand CIDR-style network notation. You may repeat +# the allow line as many times as you'd like +<% real_munin_allow.split(':').each do |val| -%> +allow <%= '^'+val.gsub(/\./, '\.')+'$' %> <% end -%> + |