BBlack has submitted this change and it was merged. Change subject: bits-legacy: remove special https://bits redirects for secure wikis ......................................................................
bits-legacy: remove special https://bits redirects for secure wikis All wikis are secure now, and bits.wikimedia.org is covered by our general varnish-level HTTPS redirects for *.wikimedia.org. Bug: T95448 Change-Id: Icb83dbe3e31692b76ce842140642288d27db0134 --- M templates/varnish/text-frontend.inc.vcl.erb 1 file changed, 0 insertions(+), 9 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/templates/varnish/text-frontend.inc.vcl.erb b/templates/varnish/text-frontend.inc.vcl.erb index c081d87..d5b8d3e 100644 --- a/templates/varnish/text-frontend.inc.vcl.erb +++ b/templates/varnish/text-frontend.inc.vcl.erb @@ -84,9 +84,6 @@ if (req.url ~ "^/event\.gif") { error 204; } - 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; - } return (lookup); } @@ -157,12 +154,6 @@ // BITS: legacy bits.wm.o domain support if (req.http.host == "<%= @cluster_options.fetch("bits_domain", "bits.wikimedia.org") %>") { if (obj.status == 204) { - set obj.http.Connection = "keep-alive"; - return (deliver); - } - if (obj.status == 301) { - set obj.http.Location = obj.response; - set obj.status = 301; set obj.http.Connection = "keep-alive"; return (deliver); } -- To view, visit https://gerrit.wikimedia.org/r/231778 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb83dbe3e31692b76ce842140642288d27db0134 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack <[email protected]> Gerrit-Reviewer: BBlack <[email protected]> Gerrit-Reviewer: Faidon Liambotis <[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
