X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=59c37c8c57deeaff49f9a5e39201744a2e63e1e6;hb=556d20a318174dba55f60c1943537480d53be91f;hp=982e637836053a0cccffea748470981e2a21f70a;hpb=26616b438be78edeeec7e521e295e58222497b74;p=mirror%2Fdsa-puppet.git diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 982e63783..59c37c8c5 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -492,7 +492,7 @@ out hosts = +debianhosts endpass message = unknown user - verify = recipient/callout=30s,use_sender + verify = recipient <%= out = "" @@ -906,9 +906,6 @@ if nodeinfo['packagesqamaster'] end out %> - deny condition = ${if match {$message_body}{\Nhttp:\/\/[a-z\.-]+\/video1?.exe\N}} - message = Blackisted URI found in body - deny condition = ${if eq {$acl_m_prf}{DBSignedMail}} condition = ${if and {{!match {$message_body}{PGP MESSAGE}} \ {!match {$message_body}{PGP SIGNED MESSAGE}} \