Mark Bergsma has submitted this change and it was merged.
Change subject: Pass test.* requests through all caching layers
......................................................................
Pass test.* requests through all caching layers
Change-Id: I0c87b862b482dc695829d38e06f6189b6f0899a2
---
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-common.inc.vcl.erb
2 files changed, 7 insertions(+), 8 deletions(-)
Approvals:
Mark Bergsma: 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 a5a74f2..e059458 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -9,18 +9,14 @@
call restrict_access;
<% if vcl_config.fetch("cluster_tier", "1") == "1" -%>
- if ( req.http.host ~ "^test\." ) {
- set req.backend = test_wikipedia;
- return (pass);
- }
-
-<% end -%>
-<% if vcl_config.fetch("cluster_tier", "1") == "1" -%>
if (req.url ~ "^/w/api\.php") {
set req.backend = api;
} else if (req.url ~ "^/w/thumb(_handler)?\.php") {
set req.backend = rendering;
}
+ if (req.http.host ~ "^test\.") {
+ set req.backend = test_wikipedia;
+ }
<% end -%>
call pass_requests;
diff --git a/templates/varnish/text-common.inc.vcl.erb
b/templates/varnish/text-common.inc.vcl.erb
index 527b5f2..44d00e8 100644
--- a/templates/varnish/text-common.inc.vcl.erb
+++ b/templates/varnish/text-common.inc.vcl.erb
@@ -5,7 +5,10 @@
return (pass);
}
if (req.http.Cookie ~ "([sS]ession|Token)=") {
- return(pass);
+ return (pass);
+ }
+ if (req.http.host ~ "^test\.") {
+ return (pass);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/75647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c87b862b482dc695829d38e06f6189b6f0899a2
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
