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 f7a988491dfaa42f3e03fb5644974a03f8fd7214..d43cb869803848aa7391aa8e185c78735a4146d2 100644 (file)
--- 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       = <mendoza@kenny.linuxsis.net> 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