BBlack has submitted this change and it was merged.
Change subject: Make /api/rest_v1/ work for test.wikipedia.org
......................................................................
Make /api/rest_v1/ work for test.wikipedia.org
RESTBase does not currently work at test.wikipedia.org, as any request to this
domain (or with the X-Wikimedia-Debug header set) is sent to the
test_wikipedia backend. This patch narrows this down to exclude /api/rest_v1/
matches.
Bug: T120977
Change-Id: I1c1881b8bc4e5d261ae771d6bfffecbfd7e3947e
---
M templates/varnish/text-backend.inc.vcl.erb
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Yurik: Looks good to me, but someone else must approve
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/text-backend.inc.vcl.erb
b/templates/varnish/text-backend.inc.vcl.erb
index 8a9fc55..9b653f6 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -16,13 +16,13 @@
set req.backend = api;
} else if (req.url ~ "^/w/thumb(_handler)?\.php") {
set req.backend = rendering;
- } else if (req.url ~ "^/api/rest_v1/") {
- set req.url = "/" + req.http.host + regsub(req.url,
"^/api/rest_v1/", "/v1/");
- set req.backend = restbase_backend;
}
-
- if (req.http.X-Wikimedia-Debug == "1") {
+ if (req.url ~ "^/api/rest_v1/") {
+ set req.url = "/" + req.http.host + regsub(req.url,
"^/api/rest_v1/", "/v1/");
+ set req.backend = restbase_backend;
+ } else if (req.http.X-Wikimedia-Debug == "1") {
+ // Note: Make sure only MW core traffic is sent to this backend.
set req.backend = test_wikipedia;
}
--
To view, visit https://gerrit.wikimedia.org/r/258498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c1881b8bc4e5d261ae771d6bfffecbfd7e3947e
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
