projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Have name copied to longname if there is no longname
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
b459bd2
..
575ad0c
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-289,6
+289,13
@@
acl_getprofile:
hosts = !+debianhosts
set acl_m_rprf = localonly
hosts = !+debianhosts
set acl_m_rprf = localonly
+<%- if nodeinfo['mailrelay'] -%>
+ warn local_parts = +local_only_users
+ domains = +mailhubdomains
+ hosts = !+debianhosts
+ set acl_m_rprf = localonly
+
+<%- end -%>
accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}}
<%- if nodeinfo['rtmaster'] -%>
accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}}
<%- if nodeinfo['rtmaster'] -%>
@@
-709,8
+716,8
@@
check_recipient:
<%- end -%>
<%- if nodeinfo['rtmaster'] -%>
warn condition = ${if eq{$acl_m_prf}{RTMail}}
<%- end -%>
<%- if nodeinfo['rtmaster'] -%>
warn condition = ${if eq{$acl_m_prf}{RTMail}}
- set acl_m12 = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{\N[^+]+\+\d+\N}}{match{$local_part}{\N[^+]+\+new\N}}{match{$local_part}{3520}}} {RTMailRecipientHasSubaddress}}}}
- # temporary hack because weasel screwed up and gave people an rt-3520@ address, which doesn't really work normally.
+ set acl_m12 = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{\N[^+]+\+\d+\N}}{match{$local_part}{\N[^+]+\+new\N}}{match{$local_part}{3520}}
{match{$local_part}{3645}}
} {RTMailRecipientHasSubaddress}}}}
+ # temporary hack because weasel screwed up and gave people an rt-3520@ address, which doesn't really work normally.
and rt-3645
#set acl_m12 = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{\N[^+]+\+\d+\N}}{match{$local_part}{\N[^+]+\+new\N}}} {RTMailRecipientHasSubaddress}}}}
#set acl_m12 = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{\N[^+]+\+\d+\N}}{match{$local_part}{\N[^+]+\+new\N}}} {RTMailRecipientHasSubaddress}}}}
@@
-883,6
+890,11
@@
acl_check_predata:
#!!# ACL that is used after the DATA command
check_message:
#!!# ACL that is used after the DATA command
check_message:
+
+ # Some people put from hostmaster@something.debian.org in the From
+ # header. Take their crack pipe away.
+ drop condition = ${if match{${lc:$h_From:}}{\Npostmaster@([^.]+\.)?debian\.org\N}}
+
<%- if nodeinfo['rtmaster'] -%>
deny condition = ${if eq {$acl_m_prf}{RTMail}}
condition = ${if and{{!match {${lc:$rh_Subject:}} {debian rt}} \
<%- if nodeinfo['rtmaster'] -%>
deny condition = ${if eq {$acl_m_prf}{RTMail}}
condition = ${if and{{!match {${lc:$rh_Subject:}} {debian rt}} \