projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
and that didn't work
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
37d576f
..
a0c95c0
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-745,7
+745,7
@@
check_recipient:
${readsocket{/var/run/postgrey/socket}{$acl_m_pgr}\
{5s}{}{action=DUNNO}}\
}{action=}{}}
${readsocket{/var/run/postgrey/socket}{$acl_m_pgr}\
{5s}{}{action=DUNNO}}\
}{action=}{}}
- message = ${sg{$acl_m_pgr}{^\\
\\w+\\
\\s*}{}}
+ message = ${sg{$acl_m_pgr}{^\\
w+
\\s*}{}}
log_message = greylisted.
condition = ${if eq{${uc:${substr{0}{5}{$acl_m_pgr}}}}{DEFER}}
log_message = greylisted.
condition = ${if eq{${uc:${substr{0}{5}{$acl_m_pgr}}}}{DEFER}}
@@
-758,7
+758,7
@@
check_recipient:
domains = +handled_domains
local_parts = GREYLIST_LOCAL_PARTS
condition = ${if eq{${uc:${substr_0_7:$acl_m_pgr}}}{PREPEND}}
domains = +handled_domains
local_parts = GREYLIST_LOCAL_PARTS
condition = ${if eq{${uc:${substr_0_7:$acl_m_pgr}}}{PREPEND}}
- message = ${sg{$acl_m_pgr}{^\\
\\w+\\
\\s*}{}}
+ message = ${sg{$acl_m_pgr}{^\\
w+
\\s*}{}}
<% end %>
<% end %>