Faidon Liambotis has submitted this change and it was merged.
Change subject: realm: rename exim_default_route_list &
exim_mediawiki_route_list
......................................................................
realm: rename exim_default_route_list & exim_mediawiki_route_list
Rename them to $mail_smarthost and $wikimail_smarthost respectively, as
they're not really an exim concept. While at it, also convert them into
proper puppet arrays, so that they can be used all over the puppet tree
as well.
Change-Id: I4b94507efa785fd6dcea8b54a1d441b1731f3fa0
---
M manifests/realm.pp
M templates/mail/exim4.minimal.erb
2 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 63fefc3..25d5d32 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -160,14 +160,14 @@
'watchlist' ]
# Route list for mail coming from MediaWiki mailer
-$exim_mediawiki_route_list = $::realm ? {
- 'production' => 'smtp.pmtpa.wmnet',
+$wikimail_smarthost = $::realm ? {
+ 'production' => [ 'smtp.pmtpa.wmnet' ],
# FIXME: find some SMTP servers for labs
- 'labs' => 'mchenry.wikimedia.org:lists.wikimedia.org'
+ 'labs' => [ 'mchenry.wikimedia.org', 'lists.wikimedia.org' ],
}
# Generic, default servers
-$exim_default_route_list = $::realm ? {
- 'production' => 'mchenry.wikimedia.org:lists.wikimedia.org',
+$mail_smarthost = $::realm ? {
+ 'production' => [ 'mchenry.wikimedia.org', 'lists.wikimedia.org' ],
# FIXME: find some SMTP servers for labs
- 'labs' => 'mchenry.wikimedia.org:lists.wikimedia.org',
+ 'labs' => [ 'mchenry.wikimedia.org', 'lists.wikimedia.org' ],
}
diff --git a/templates/mail/exim4.minimal.erb b/templates/mail/exim4.minimal.erb
index b0e37cb..19b33b1 100644
--- a/templates/mail/exim4.minimal.erb
+++ b/templates/mail/exim4.minimal.erb
@@ -51,14 +51,14 @@
condition = ${if eqi{$header_X-Mailer:}{MediaWiki mailer}}
errors_to = [email protected]
transport = remote_smtp
- route_list = * <%= exim_mediawiki_route_list %>
+ route_list = * <%= @wikimail_smarthost.join(':') %>
# Send all mail via a set of mail relays ("smart hosts")
smart_route:
driver = manualroute
transport = remote_smtp
- route_list = * <%= exim_default_route_list %>
+ route_list = * <%= @mail_smarthost.join(':') %>
begin transports
--
To view, visit https://gerrit.wikimedia.org/r/141404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b94507efa785fd6dcea8b54a1d441b1731f3fa0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
