X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=fb7b0838bc1ea7fc1555ca51cafc5e60a180b58f;hb=68a9001c3cd5c120c52a470ffd70fcc7d68964f7;hp=5d4af665bfbcc8ff44fd3f352b9f93c8c504203a;hpb=02f435d786ffa82b09916197289e56dad01a2f32;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 5d4af665b..fb7b0838b 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -239,7 +239,7 @@ ports = []
 out = "daemon_smtp_ports = "
 ports << 25
 
-if nodeinfo['bugsmaster']
+if nodeinfo['bugsmaster'] or nodeinfo['bugsmx']
   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,
@@ -491,6 +490,12 @@ if nodeinfo['smarthost'].empty?
        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
 %>
@@ -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
-	  !verify  = sender/callout
+	  !verify  = sender/callout=90s,maxwait=300s
 '
 end
 out
@@ -1375,14 +1380,18 @@ 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
-  domains = bugs.debian.org
+  domains = ' + domain + '
   cannot_route_message = Unknown or archived bug
   require_files = /org/bugs.debian.org/mail/run-procmail
   no_more
@@ -1675,7 +1684,7 @@ bsmtp:
 
 <%=
 out = ""
-if nodeinfo['bugsmaster']
+if nodeinfo['bugsmaster'] or nodeinfo['bugsmx']
   out = '
 bugs_pipe:
   driver = pipe