Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/302676
Change subject: realm: Don't qualify the lookups to ::site in realm.pp
......................................................................
realm: Don't qualify the lookups to ::site in realm.pp
realm.pp is imported in top scope, so there is no point in qualifying
the lookups to it inside realm.pp. Fix that
Change-Id: Iee7cf8af121c35ef3c61afedf1457d240ffb79f2
---
M manifests/realm.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/302676/1
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 32fdb3d..75647ea 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -210,7 +210,7 @@
# Route list for mail coming from MediaWiki mailer
$wikimail_smarthost = $realm ? {
- 'production' => $::site ? {
+ 'production' => $site ? {
'eqiad' => [ 'wiki-mail-eqiad.wikimedia.org',
'wiki-mail-codfw.wikimedia.org' ],
'codfw' => [ 'wiki-mail-codfw.wikimedia.org',
'wiki-mail-eqiad.wikimedia.org' ],
default => [ 'wiki-mail-eqiad.wikimedia.org',
'wiki-mail-codfw.wikimedia.org' ],
@@ -223,7 +223,7 @@
}
# Generic, default servers (order matters!)
$mail_smarthost = $realm ? {
- 'production' => $::site ? {
+ 'production' => $site ? {
'eqiad' => [ 'mx1001.wikimedia.org', 'mx2001.wikimedia.org' ],
'codfw' => [ 'mx2001.wikimedia.org', 'mx1001.wikimedia.org' ],
default => [ 'mx1001.wikimedia.org', 'mx2001.wikimedia.org' ],
--
To view, visit https://gerrit.wikimedia.org/r/302676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee7cf8af121c35ef3c61afedf1457d240ffb79f2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
