tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "munin: Minor update to munin-node.conf based on the example config"

Browse source 
This reverts commit e98f6f028c, which
broke munin versions before 2.0.
This commit is contained in:
Ossi Salmi 2014-11-19 09:36:03 +02:00
parent e98f6f028c
commit 0dde4f2ddb
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
munin/templates/munin-node.conf.erb
View file

@ -21,8 +21,7 @@ group root
<% end -%> <% end -%>
# Regexps for files to ignore # Regexps for files to ignore
ignore_file [\#~]$ ignore_file ~$
ignore_file DEADJOE$
ignore_file \.bak$ ignore_file \.bak$
ignore_file %$ ignore_file %$
ignore_file \.dpkg-(tmp|new|old|dist)$ ignore_file \.dpkg-(tmp|new|old|dist)$
@ -35,10 +34,9 @@ ignore_file \.pod$
host_name <%= @homename %> host_name <%= @homename %>
# A list of addresses that are allowed to connect. This must be a # A list of addresses that are allowed to connect. This must be a
# regular expression, since Net::Server does not understand CIDR-style # regular expression, due to brain damage in Net::Server, which
# network notation unless the perl module Net::CIDR is installed. You # doesn't understand CIDR-style network notation. You may repeat
# may repeat the allow line as many times as you'd like # the allow line as many times as you'd like
<% @munin_allow.each do |allow| -%> <% @munin_allow.each do |allow| -%>
allow <%= "^%s$" % allow.gsub('.', '\.') %> allow <%= "^%s$" % allow.gsub('.', '\.') %>
<% end -%> <% end -%>