projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
fd29ff3
)
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
author
Stephen Gran
<steve@lobefin.net>
Sat, 11 Jul 2009 18:55:47 +0000
(19:55 +0100)
committer
Stephen Gran
<steve@lobefin.net>
Sat, 11 Jul 2009 18:55:47 +0000
(19:55 +0100)
modules/exim/templates/eximconf.erb
patch
|
blob
|
history
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
552b03a
..
59c37c8
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-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}} \