BBlack has submitted this change and it was merged.
Change subject: text VCL: refactor backend selection
......................................................................
text VCL: refactor backend selection
Should be a functional no-op, but aligns the logic a little closer
to where it needs to be for future declarative approach.
Bug: T110717
Change-Id: I04cb67b1cfc2c93bdbd3126ecdb65d7497b4c0ab
---
M templates/varnish/text-backend.inc.vcl.erb
1 file changed, 21 insertions(+), 19 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/text-backend.inc.vcl.erb
b/templates/varnish/text-backend.inc.vcl.erb
index 422ced4..1cc8f3e 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -15,26 +15,28 @@
set req.backend = citoid_backend;
} else if (req.http.Host == "rest.wikimedia.org" ) { # LEGACY: to be
removed eventually
set req.backend = restbase_backend;
- } else if (req.url ~ "^/w/api\.php") {
- if (req.http.X-Wikimedia-Debug) {
- set req.backend = appservers_debug;
+ } else { // default for all other hostnames
+ if (req.url ~ "^/api/rest_v1/") {
+ set req.backend = restbase_backend;
+ } else if (req.url ~ "^/w/api\.php") {
+ 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) {
+ set req.backend = appservers_debug;
+ } else {
+ set req.backend = rendering;
+ }
} else {
- set req.backend = api;
- }
- } else if (req.url ~ "^/w/thumb(_handler)?\.php") {
- if (req.http.X-Wikimedia-Debug) {
- set req.backend = appservers_debug;
- } else {
- set req.backend = rendering;
- }
- } else if (req.url ~ "^/api/rest_v1/") {
- set req.backend = restbase_backend;
- } else {
- // default MW backend
- if (req.http.X-Wikimedia-Debug) {
- set req.backend = appservers_debug;
- } else {
- set req.backend = appservers;
+ // default MW backend
+ if (req.http.X-Wikimedia-Debug) {
+ set req.backend = appservers_debug;
+ } else {
+ set req.backend = appservers;
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/300560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I04cb67b1cfc2c93bdbd3126ecdb65d7497b4c0ab
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
