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 add virtualdomain to byrd
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
5d4af66
..
fb7b083
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-239,7
+239,7
@@
ports = []
out = "daemon_smtp_ports = "
ports << 25
out = "daemon_smtp_ports = "
ports << 25
-if nodeinfo['bugsmaster']
+if nodeinfo['bugsmaster']
or nodeinfo['bugsmx']
ports << 587
end
ports << 587
end
@@
-413,7
+413,6
@@
out
%>
<%=
%>
<%=
-out = ""
if nodeinfo['smarthost'].empty?
out = '
# These are in HELO acl so that they are only run once. They increment a counter,
if nodeinfo['smarthost'].empty?
out = '
# These are in HELO acl so that they are only run once. They increment a counter,
@@
-491,6
+490,12
@@
if nodeinfo['smarthost'].empty?
log_message = random HELO
set acl_c_scr = ${eval:$acl_c_scr+5}
'
log_message = random HELO
set acl_c_scr = ${eval:$acl_c_scr+5}
'
+else
+ out = '
+ drop !hosts = +debianhosts
+ log_message = mail from non-d.o host
+ message = Interesting. I doubt that should have happened.
+'
end
out
%>
end
out
%>
@@
-891,7
+896,7
@@
if nodeinfo['smarthost'].empty?
{${lookup{$local_part}lsearch{/etc/exim4/callout_users}{$local_part}{}} : \
${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-callout}{$local_part}{}}}}
!hosts = +debianhosts : WHITELIST
{${lookup{$local_part}lsearch{/etc/exim4/callout_users}{$local_part}{}} : \
${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-callout}{$local_part}{}}}}
!hosts = +debianhosts : WHITELIST
- !verify = sender/callout
+ !verify = sender/callout
=90s,maxwait=300s
'
end
out
'
end
out
@@
-1375,14
+1380,18
@@
out
<%=
out = ""
<%=
out = ""
-if nodeinfo['bugsmaster']
+if nodeinfo['bugsmaster'] or nodeinfo['bugsmx']
+ domain = 'bugs.debian.org'
+ if nodeinfo['bugsmaster']
+ domain = 'bugs-master.debian.org'
+ end
out = '
# This router delivers for bugs.d.o
bugs:
debug_print = "R: bugs for $local_part@$domain"
driver = accept
transport = bugs_pipe
out = '
# This router delivers for bugs.d.o
bugs:
debug_print = "R: bugs for $local_part@$domain"
driver = accept
transport = bugs_pipe
- domains =
bugs.debian.org
+ domains =
' + domain + '
cannot_route_message = Unknown or archived bug
require_files = /org/bugs.debian.org/mail/run-procmail
no_more
cannot_route_message = Unknown or archived bug
require_files = /org/bugs.debian.org/mail/run-procmail
no_more
@@
-1675,7
+1684,7
@@
bsmtp:
<%=
out = ""
<%=
out = ""
-if nodeinfo['bugsmaster']
+if nodeinfo['bugsmaster']
or nodeinfo['bugsmx']
out = '
bugs_pipe:
driver = pipe
out = '
bugs_pipe:
driver = pipe