projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
this is a better way to do it
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
8ba7786
..
97b96cb
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'] -%>
@@
-886,7
+893,7
@@
check_message:
# Some people put from hostmaster@something.debian.org in the From
# header. Take their crack pipe away.
# 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}}
+ drop condition = ${if match{${lc:$h_From:}}{\Npostmaster@([^.]+
\
.)?debian\.org\N}}
<%- if nodeinfo['rtmaster'] -%>
deny condition = ${if eq {$acl_m_prf}{RTMail}}
<%- if nodeinfo['rtmaster'] -%>
deny condition = ${if eq {$acl_m_prf}{RTMail}}