Mark Bergsma has submitted this change and it was merged.
Change subject: Add support for gerrit.wikimedia.org to the misc cluster
......................................................................
Add support for gerrit.wikimedia.org to the misc cluster
Change-Id: I4133658096669422346bee1259c54080e7d88913
---
M manifests/role/cache.pp
M templates/varnish/misc.inc.vcl.erb
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 6cb9c7e..d871621 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1141,10 +1141,10 @@
'ssl_proxies' => $wikimedia_networks,
'default_backend' => 'antimony', # FIXME
},
- backends => [ 'antimony.wikimedia.org' ],
+ backends => [ 'antimony.wikimedia.org',
'manganese.wikimedia.org' ],
backend_options => [
{
- 'backend_match' => '^antimony',
+ 'backend_match' => '^(antimony|manganese)',
'port' => 8080,
},
{
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index 6e0961e..1bca91c 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -7,6 +7,9 @@
set req.http.X-Forwarded-Proto = "https";
set req.http.X-Forwarded-Port = "443";
return (lookup);
+ } elsif (req.http.Host == "gerrit.wikimedia.org") {
+ set req.backend = manganese;
+ return (lookup);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/79204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4133658096669422346bee1259c54080e7d88913
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
