From 0dde4f2ddb7ee3073370544de27b1ee144127b37 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 19 Nov 2014 09:36:03 +0200
Subject: [PATCH] Revert "munin: Minor update to munin-node.conf based on the
 example config"

This reverts commit e98f6f028c550fe0782a3162f3777b69a1a8dd09, which
broke munin versions before 2.0.
---
 munin/templates/munin-node.conf.erb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/munin/templates/munin-node.conf.erb b/munin/templates/munin-node.conf.erb
index e3a012b..4ad149f 100644
--- a/munin/templates/munin-node.conf.erb
+++ b/munin/templates/munin-node.conf.erb
@@ -21,8 +21,7 @@ group root
 <% end -%>
 
 # Regexps for files to ignore
-ignore_file [\#~]$
-ignore_file DEADJOE$
+ignore_file ~$
 ignore_file \.bak$
 ignore_file %$
 ignore_file \.dpkg-(tmp|new|old|dist)$
@@ -35,10 +34,9 @@ ignore_file \.pod$
 host_name <%= @homename %>
 
 # A list of addresses that are allowed to connect.  This must be a
-# regular expression, since Net::Server does not understand CIDR-style
-# network notation unless the perl module Net::CIDR is installed.  You
-# may repeat the allow line as many times as you'd like
-
+# 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
 <% @munin_allow.each do |allow| -%>
 allow <%= "^%s$" % allow.gsub('.', '\.') %>
 <% end -%>