Mark Bergsma has submitted this change and it was merged. Change subject: Route list outbound mail to a separate SMTP transport ......................................................................
Route list outbound mail to a separate SMTP transport This allows separate SMTP settings/parameters to be used, and avoids problems due to message batching mixed with normal mail at the remote_smtp transport Change-Id: I7cebaa9a30a8859d4244ba5b815afb5cdeb3d08c --- M manifests/mail.pp M manifests/site.pp M templates/exim/exim4.conf.SMTP_IMAP_MM.erb 3 files changed, 23 insertions(+), 2 deletions(-) Approvals: Mark Bergsma: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/mail.pp b/manifests/mail.pp index 41f5108..f26175a 100644 --- a/manifests/mail.pp +++ b/manifests/mail.pp @@ -131,6 +131,8 @@ # Enable/disable SpamAssassin spam checking # - $outbound_ips: # IP addresses to use for sending outbound e-mail + # - $list_outbound_ips: + # IP addresses to use for sending outbound e-mail from Mailman # - $hold_domains: # List of domains to hold on the queue without processing class roled( @@ -146,6 +148,7 @@ $rt_relay="false", $enable_spamassassin="false", $outbound_ips=[ $ipaddress ], + $list_outbound_ips=[], $hold_domains=[] ) { class { "exim::config": install_type => "heavy", queuerunner => "combined" } diff --git a/manifests/site.pp b/manifests/site.pp index 15737b5..a3384c3 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2421,6 +2421,7 @@ class { exim::roled: outbound_ips => [ "208.80.154.4", "2620:0:861:1::2" ], + list_outbound_ips => [ "208.80.154.4", "2620:0:861:1::2" ], local_domains => [ "+system_domains", "+mailman_domains" ], enable_mail_relay => "secondary", enable_mailman => "true", diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb index a940c7f..cdcbeef 100644 --- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb +++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb @@ -318,6 +318,16 @@ begin routers +<% if enable_mailman == "true" then -%> +list_outbound: + driver = dnslookup + domains = ! +local_domains + senders = *@lists.wikimedia.org + condition = ${if match_ip{$sender_host_address}{@[]}} + transport = list_smtp + no_verify + +<% end -%> <% if enable_mail_relay == "secondary" then -%> # Route relay domains only if the higher prio MXes are in the allowed list secondary: @@ -339,7 +349,8 @@ transport = bulk_smtp ignore_target_hosts = <; 0.0.0.0 ; 127.0.0.0/8 ; 10/8 ; 172.16/12 ; 192.168/16 no_verify -<% end %> + +<% end -%> <% if enable_mail_relay != "false" then -%> # Send donate.wikimedia.org mail to Fundraising CiviCRM server donate: @@ -654,7 +665,13 @@ <% if (enable_otrs_server == "false" ) -%> interface = <; <%= outbound_ips.join(" ; ") %> <% end -%> -<% if (enable_mailman == "true" ) -%> +<% if enable_mailman == "true" -%> + helo_data = lists.wikimedia.org + +list_smtp: + driver = smtp + hosts_avoid_tls = <; 0.0.0.0/0 ; 0::0/0 + interface = <; <%= list_outbound_ips.join(" ; ") %> helo_data = lists.wikimedia.org <% end -%> -- To view, visit https://gerrit.wikimedia.org/r/79342 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7cebaa9a30a8859d4244ba5b815afb5cdeb3d08c Gerrit-PatchSet: 7 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits