Faidon Liambotis has submitted this change and it was merged.
Change subject: Switch mail smarthosts to mx1001/mx2001
......................................................................
Switch mail smarthosts to mx1001/mx2001
Switch to the new MXes, from the old polonium/lead. Now that we have one
in codfw as well, make the smarthost dependent on $::site and prefer the
local one.
Change-Id: I39a64fefd047e2a886b2d4c4e8808bf541958914
---
M manifests/realm.pp
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 94c536a1..8d45c63 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -179,12 +179,16 @@
'production' => [ 'wiki-mail-eqiad.wikimedia.org' ],
'labs' => $::labsproject ? {
'deployment-prep' => [ 'deployment-mx.eqiad.wmflabs' ],
- default => [ 'polonium.wikimedia.org', 'lead.wikimedia.org'
],
+ default => [ 'mx1001.wikimedia.org', 'mx2001.wikimedia.org'
],
}
}
# Generic, default servers (order matters!)
$mail_smarthost = $::realm ? {
- 'production' => [ 'polonium.wikimedia.org', 'lead.wikimedia.org' ],
+ 'production' => $::site ? {
+ 'eqiad' => [ 'mx1001.wikimedia.org', 'mx2001.wikimedia.org' ],
+ 'codfw' => [ 'mx2001.wikimedia.org', 'mx1001.wikimedia.org' ],
+ default => [ 'mx1001.wikimedia.org', 'mx2001.wikimedia.org' ],
+ },
# FIXME: find some SMTP servers for labs
- 'labs' => [ 'polonium.wikimedia.org', 'lead.wikimedia.org' ],
+ 'labs' => [ 'mx1001.wikimedia.org', 'mx2001.wikimedia.org' ],
}
--
To view, visit https://gerrit.wikimedia.org/r/240087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39a64fefd047e2a886b2d4c4e8808bf541958914
Gerrit-PatchSet: 3
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
