Block a sender of spam backscatter

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index 33162a3189b28d963b1e6f100181ce15a900fe73..e22fd74253254deced5698f016238ba524aebc03 100644 (file)
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -387,7 +387,7 @@ acl_check_rcpt:
 
   # Block sender of spam backscatter
 
-  deny    senders       = www-data@www.easyticket.de
+  deny    senders       = www-data@www.easyticket.de:info@realestate.co.nz
 
   # Accept mail to postmaster in any local domain, regardless of the source,
   # and without verifying the sender.

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index 5134e6da1866026f82ff7343182cee2ec9224fd3..bfce7af12a9c0996b606dc844cbe676617456574 100644 (file)
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -341,6 +341,7 @@ unknown_limit 144
     squid_requests.errors.draw STACK
     squid_requests.requests.sum <%= Chef::Munin.expand "%%name%%.openstreetmap:squid_requests.requests", @tilecaches %>
     squid_requests.requests.label misses
+    squid_requests.requests.cdef requests,hits,-,errors,-
     squid_requests.requests.draw STACK
     squid_traffic.graph_title Squid traffic status
     squid_traffic.graph_args --base 1000