BBlack has submitted this change and it was merged.
Change subject: misc VCL: merge duplicate backend blocks
......................................................................
misc VCL: merge duplicate backend blocks
Change-Id: I863b153117d7eedbf2425c9b49e1d3ddeef6b6f1
---
M templates/varnish/misc-backend.inc.vcl.erb
1 file changed, 3 insertions(+), 9 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/misc-backend.inc.vcl.erb
b/templates/varnish/misc-backend.inc.vcl.erb
index 35ec9e3..a1faafd 100644
--- a/templates/varnish/misc-backend.inc.vcl.erb
+++ b/templates/varnish/misc-backend.inc.vcl.erb
@@ -9,9 +9,7 @@
set req.backend = antimony;
} elsif (req.http.Host == "piwik.wikimedia.org") {
set req.backend = bohrium;
- } elsif (req.http.Host == "releases.wikimedia.org") {
- set req.backend = bromine;
- } elsif (req.http.Host == "static-bugzilla.wikimedia.org" || req.http.Host
== "annual.wikimedia.org" || req.http.Host == "transparency.wikimedia.org" ||
req.http.Host == "15.wikipedia.org") {
+ } elsif (req.http.Host == "static-bugzilla.wikimedia.org" || req.http.Host
== "annual.wikimedia.org" || req.http.Host == "transparency.wikimedia.org" ||
req.http.Host == "15.wikipedia.org" || req.http.Host ==
"releases.wikimedia.org") {
set req.backend = bromine;
} elsif (req.http.Host == "horizon.wikimedia.org") {
set req.backend = californium;
@@ -25,9 +23,7 @@
set req.backend = graphite1001;
} elsif (req.http.Host == "phabricator.wikimedia.org" || req.http.Host ==
"phab.wmfusercontent.org" || req.http.Host == "bugzilla.wikimedia.org" ||
req.http.Host == "bugs.wikimedia.org") {
set req.backend = iridium;
- } elsif (req.http.Host == "grafana.wikimedia.org" || req.http.host ==
"grafana-admin.wikimedia.org") {
- set req.backend = krypton;
- } elsif (req.http.Host == "scholarships.wikimedia.org" || req.http.Host ==
"iegreview.wikimedia.org" || req.http.Host == "racktables.wikimedia.org") {
+ } elsif (req.http.Host == "scholarships.wikimedia.org" || req.http.Host ==
"iegreview.wikimedia.org" || req.http.Host == "racktables.wikimedia.org" ||
req.http.Host == "grafana.wikimedia.org" || req.http.host ==
"grafana-admin.wikimedia.org") {
set req.backend = krypton;
} elsif (req.http.Host == "labtesthorizon.wikimedia.org") {
set req.backend = labtestweb2001;
@@ -49,9 +45,7 @@
set req.backend = ruthenium;
} elsif (req.http.Host == "people.wikimedia.org") {
set req.backend = rutherfordium;
- } elsif (req.http.Host == "metrics.wikimedia.org" || req.http.Host ==
"stats.wikimedia.org") {
- set req.backend = stat1001;
- } elsif (req.http.Host == "datasets.wikimedia.org") {
+ } elsif (req.http.Host == "metrics.wikimedia.org" || req.http.Host ==
"stats.wikimedia.org" || req.http.Host == "datasets.wikimedia.org") {
set req.backend = stat1001;
} elsif (req.http.Host == "query.wikidata.org"){
set req.backend = wdqs_director;
--
To view, visit https://gerrit.wikimedia.org/r/282157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I863b153117d7eedbf2425c9b49e1d3ddeef6b6f1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
