Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: varnish: remove redirection to the hhvm pool
......................................................................
varnish: remove redirection to the hhvm pool
Change-Id: I39064328aabd1e7e5147e464e879a22e39c839fb
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M templates/varnish/bits.inc.vcl.erb
M templates/varnish/mobile-backend.inc.vcl.erb
M templates/varnish/text-backend.inc.vcl.erb
3 files changed, 0 insertions(+), 26 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/bits.inc.vcl.erb
b/templates/varnish/bits.inc.vcl.erb
index 86ebb26..6f4e20e 100644
--- a/templates/varnish/bits.inc.vcl.erb
+++ b/templates/varnish/bits.inc.vcl.erb
@@ -39,12 +39,6 @@
error 403 "HTTP method not allowed.";
}
-<% if vcl_config.fetch("cluster_tier", "1") == "1" -%>
- if ( req.http.Cookie ~ "hhvm=true" ) {
- set req.backend = hhvm_appservers;
- }
-<% end -%>
-
if (req.http.host == "<%= cluster_options.fetch( "bits_domain",
"bits.wikimedia.org" )%>") {
/* For https-only wikis, the redirect from http to https for bits
assets should occur
in varnish instead of apache, since the apache redirect and
mediawiki doesn't
diff --git a/templates/varnish/mobile-backend.inc.vcl.erb
b/templates/varnish/mobile-backend.inc.vcl.erb
index 39dd29c..36e7ca4 100644
--- a/templates/varnish/mobile-backend.inc.vcl.erb
+++ b/templates/varnish/mobile-backend.inc.vcl.erb
@@ -19,17 +19,6 @@
}
<% end -%>
-<% if vcl_config.fetch("cluster_tier", "1") == "1" -%>
- /* Use the hhvm backend for any request to the standard appservers */
- if ( req.http.X-Orig-Cookie ~ "hhvm=true" ) {
- if (req.backend == api) {
- set req.backend = hhvm_api;
- } else {
- set req.backend = hhvm_appservers;
- }
- }
-<% end -%>
-
/* Default (now modified) Varnish vcl_recv function */
if (req.request != "GET" && req.request != "HEAD") {
/* We only deal with GET and HEAD by default */
diff --git a/templates/varnish/text-backend.inc.vcl.erb
b/templates/varnish/text-backend.inc.vcl.erb
index 9e27f3c..30f23e3 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -36,15 +36,6 @@
if (req.http.host ~ "^test\.") {
set req.backend = test_wikipedia;
}
-
- /* Use the hhvm backend for any request to the standard appservers. */
- if ( req.http.Cookie ~ "hhvm=true" ) {
- if (req.backend == api) {
- set req.backend = hhvm_api;
- } else {
- set req.backend = hhvm_appservers;
- }
- }
<% end -%>
call pass_requests;
--
To view, visit https://gerrit.wikimedia.org/r/175432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39064328aabd1e7e5147e464e879a22e39c839fb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
