Asher has submitted this change and it was merged.

Change subject: Remove mobile hacks from bits
......................................................................


Remove mobile hacks from bits

Change-Id: I1ff4b04587520b0c5a100f02e7b82ccb9ebb836f
---
M templates/varnish/bits.inc.vcl.erb
1 file changed, 0 insertions(+), 6 deletions(-)

Approvals:
  Asher: Verified; 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 da9e28e..abbd7cf 100644
--- a/templates/varnish/bits.inc.vcl.erb
+++ b/templates/varnish/bits.inc.vcl.erb
@@ -1,7 +1,6 @@
 # Varnish VCL include file for bits
 
 include "errorpage.inc.vcl";
-include "device-detection.inc.vcl";
 
 sub vcl_recv {
        /* Since we are allowing POST at wikimedia3.vcl.erb, disallow here */
@@ -17,11 +16,6 @@
                vary by protocol. This can result in a redirect loop and assets 
not loading. */
                if ( req.url ~ 
"^/(auditcom|boardgovcom|board|chair|chapcom|checkuser|collab|donate|exec|fdc|grants|internal|movementroles|nomcom|office|otrs-wiki|searchcom|spcom|steward|wikimaniateam)\.wikimedia\.org/"
 && req.http.X-Forwarded-Proto != "https" ) {
                        error 301 "https://<%= cluster_options.fetch( 
"bits_domain", "bits.wikimedia.org" )%>" + req.url;
-               }
-               # Add X-Device to mobile load.php requests
-               if (req.url ~ "^/m/") {
-                       set req.url = regsub(req.url, "^/m/", "/");
-                       call device_detection;
                }
 <% if cluster_options.fetch( "enable_geoiplookup", false ) -%>
                if (req.url == "/geoiplookup") {

-- 
To view, visit https://gerrit.wikimedia.org/r/73342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ff4b04587520b0c5a100f02e7b82ccb9ebb836f
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Asher <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to