From: Peter Palfrader Date: Tue, 19 Jun 2012 19:27:42 +0000 (+0200) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f47e3bc07ecb609dd2f180925300aa3bf503ef66;hp=dd401e461e4a6e250300bede2d3ab65d1193fe62;p=dsa-puppet.git Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: Revert "bad hack - take away in a day or so" --- diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index f7a98849..d43cb869 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -613,10 +613,6 @@ check_recipient: hosts = 65.110.39.147 : 64.39.31.15 message = cannot forward here while mailer-daemon mail is not caught - deny recipients = risko@debian.org - senders = : - message = please stop joe-jobbing this user now - deny condition = ${lookup{$sender_address_local_part}lsearch{/etc/exim4/localusers}{true}} sender_domains= +local_domains hosts = !+debianhosts