diff options
| author | mh <mh@immerda.ch> | 2008-06-13 20:02:35 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-06-13 20:02:35 +0000 |
| commit | 805d56cac760f6d047b83c470c080bee3342165f (patch) | |
| tree | 9d24e887cccc04e27a1d41c1fb1b830451b30327 /templates | |
| parent | 86977f459f20c2bb55eec6cbed9f49fc2dca25ab (diff) | |
Merge commit 'puzzle/development'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/munin-node.conf.Debian.etch | 6 | ||||
| -rw-r--r-- | templates/munin-node.conf.default | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/templates/munin-node.conf.Debian.etch b/templates/munin-node.conf.Debian.etch index 0f0f568..56da89d 100644 --- a/templates/munin-node.conf.Debian.etch +++ b/templates/munin-node.conf.Debian.etch @@ -33,5 +33,7 @@ host_name <%= fqdn %> # 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 -allow <%= munin_allow1 %> -allow <%= munin_allow2 %> +<% real_munin_allow.split(':').each do |val| -%> +allow <%= '^'+val.gsub(/\./, '\.')+'$' %> +<% end -%> + diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default index f10349e..5eed749 100644 --- a/templates/munin-node.conf.default +++ b/templates/munin-node.conf.default @@ -33,7 +33,6 @@ host_name <%= fqdn %> # 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 -allow ^127\.0\.0\.1$ -allow <%= munin_allow1 %> -allow <%= munin_allow2 %> - +<% real_munin_allow.split(':').each do |val| -%> +allow <%= '^'+val.gsub(/\./, '\.')+'$' %> +<% end -%> |