Ori.livneh has submitted this change and it was merged.
Change subject: VCL: pass all "X-Wikimedia-Debug"-bearing requests to
appservers_debug backend
......................................................................
VCL: pass all "X-Wikimedia-Debug"-bearing requests to appservers_debug backend
As part of T129000, all requests which bear the HTTP header X-Wikimedia-Debug
should be passed to the appservers_debug backend, which will route the request
based on the header value.
Bug: T129000
Change-Id: I4f62da46a2339029c13c02fd4e896e04b2b13bed
---
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-common.inc.vcl.erb
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/templates/varnish/text-backend.inc.vcl.erb
b/templates/varnish/text-backend.inc.vcl.erb
index 5b0546a..77ca313 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -16,13 +16,13 @@
} else if (req.http.Host ~ "restbase|^rest\." ) { # LEGACY: to be
removed eventually
set req.backend = restbase_backend;
} else if (req.url ~ "^/w/api\.php") {
- if (req.http.X-Wikimedia-Debug == "1") {
+ if (req.http.X-Wikimedia-Debug) {
set req.backend = appservers_debug;
} else {
set req.backend = api;
}
} else if (req.url ~ "^/w/thumb(_handler)?\.php") {
- if (req.http.X-Wikimedia-Debug == "1") {
+ if (req.http.X-Wikimedia-Debug) {
set req.backend = appservers_debug;
} else {
set req.backend = rendering;
@@ -31,7 +31,7 @@
set req.backend = restbase_backend;
} else {
// default MW backend
- if (req.http.X-Wikimedia-Debug == "1") {
+ if (req.http.X-Wikimedia-Debug) {
set req.backend = appservers_debug;
} else {
set req.backend = appservers;
diff --git a/templates/varnish/text-common.inc.vcl.erb
b/templates/varnish/text-common.inc.vcl.erb
index c825adf..0110aa7 100644
--- a/templates/varnish/text-common.inc.vcl.erb
+++ b/templates/varnish/text-common.inc.vcl.erb
@@ -73,7 +73,7 @@
return (pass);
}
- if (req.http.X-Wikimedia-Debug == "1" ||
req.http.X-Wikimedia-Security-Audit == "1") {
+ if (req.http.X-Wikimedia-Debug || req.http.X-Wikimedia-Security-Audit
== "1") {
return (pass);
}
--
To view, visit https://gerrit.wikimedia.org/r/275695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f62da46a2339029c13c02fd4e896e04b2b13bed
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
