projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eximconf: use acl_m_defopt instead of re-evaluating HAS_DEFAULT_OPTIONS
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
1441c9b
..
ee73e02
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-810,7
+810,7
@@
check_recipient:
log_message = greylisted.
condition = ${if or { \
{eq{$acl_m_grey_recip}{1}} \
log_message = greylisted.
condition = ${if or { \
{eq{$acl_m_grey_recip}{1}} \
- {bool_lax{
HAS_DEFAULT_OPTIONS
}} \
+ {bool_lax{
$acl_m_defopt
}} \
} \
}
!senders = :
} \
}
!senders = :
@@
-851,7
+851,7
@@
check_recipient:
domains = +handled_domains
condition = ${if or { \
{eq{$acl_m_grey_recip}{1}} \
domains = +handled_domains
condition = ${if or { \
{eq{$acl_m_grey_recip}{1}} \
- {bool_lax{
HAS_DEFAULT_OPTIONS
}} \
+ {bool_lax{
$acl_m_defopt
}} \
} \
}
set acl_m_pgr = request=smtpd_access_policy\n\
} \
}
set acl_m_pgr = request=smtpd_access_policy\n\
@@
-881,7
+881,7
@@
check_recipient:
domains = +handled_domains
condition = ${if or { \
{eq{$acl_m_grey_recip}{1}} \
domains = +handled_domains
condition = ${if or { \
{eq{$acl_m_grey_recip}{1}} \
- {bool_lax{
HAS_DEFAULT_OPTIONS
}} \
+ {bool_lax{
$acl_m_defopt
}} \
} \
}
condition = ${if eq{${uc:${substr_0_7:$acl_m_pgr}}}{PREPEND}}
} \
}
condition = ${if eq{${uc:${substr_0_7:$acl_m_pgr}}}{PREPEND}}
@@
-915,7
+915,7
@@
check_recipient:
!hosts = +debianhosts : WHITELIST
deny message = host $sender_host_address is listed in $dnslist_domain ($dnslist_value); see $dnslist_text
!hosts = +debianhosts : WHITELIST
deny message = host $sender_host_address is listed in $dnslist_domain ($dnslist_value); see $dnslist_text
- condition = ${if bool_lax{
HAS_DEFAULT_OPTIONS
}}
+ condition = ${if bool_lax{
$acl_m_defopt
}}
dnslists = relays.dnsbl.sorbs.net : xbl.spamhaus.org
domains = +handled_domains
!hosts = +debianhosts : WHITELIST
dnslists = relays.dnsbl.sorbs.net : xbl.spamhaus.org
domains = +handled_domains
!hosts = +debianhosts : WHITELIST
@@
-936,7
+936,7
@@
check_recipient:
!hosts = +debianhosts : WHITELIST
deny message = domain $sender_address_domain is listed in $dnslist_domain ($dnslist_value); see $dnslist_text
!hosts = +debianhosts : WHITELIST
deny message = domain $sender_address_domain is listed in $dnslist_domain ($dnslist_value); see $dnslist_text
- condition = ${if bool_lax{
HAS_DEFAULT_OPTIONS
}}
+ condition = ${if bool_lax{
$acl_m_defopt
}}
dnslists = dbl.spamhaus.org/$sender_address_domain
domains = +handled_domains
!hosts = +debianhosts : WHITELIST
dnslists = dbl.spamhaus.org/$sender_address_domain
domains = +handled_domains
!hosts = +debianhosts : WHITELIST