Faidon has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/80029


Change subject: exim: switch sodium non-list mail to its own IP
......................................................................

exim: switch sodium non-list mail to its own IP

Don't use the lists service IP fqdn (as HELO) for mail relay traffic but
keep it only for lists traffic.

Change-Id: I0d24518dd0f1168b2d50c783cce4f3b1354cdf7c
---
M manifests/site.pp
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/80029/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 6a96772..0c3f33b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2481,7 +2481,7 @@
     }
 
     class { exim::roled:
-        outbound_ips => [ "208.80.154.4", "2620:0:861:1::2" ],
+        outbound_ips => [ "208.80.154.61", "2620:0:861:1:208:80:154:61" ],
         list_outbound_ips => [ "208.80.154.4", "2620:0:861:1::2" ],
         local_domains => [ "+system_domains", "+mailman_domains" ],
         enable_mail_relay => "secondary",
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb 
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index 7ce2707..79fc48f 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -669,7 +669,6 @@
        interface = <; <%= outbound_ips.join(" ; ") %>
 <% end -%>
 <% if enable_mailman == "true" -%>
-       helo_data = lists.wikimedia.org
 
 list_smtp:
        driver = smtp

-- 
To view, visit https://gerrit.wikimedia.org/r/80029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d24518dd0f1168b2d50c783cce4f3b1354cdf7c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <fai...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to