BBlack has submitted this change and it was merged.
Change subject: HTTPS: Redirect upload (but not for MW UA)
......................................................................
HTTPS: Redirect upload (but not for MW UA)
Change-Id: I5c6ccd94b03fbbaccdd4d3de08d31b86eac8f0eb
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 6 insertions(+), 9 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index f0ed99c..029fa43 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -173,15 +173,12 @@
if (req.http.X-Forwarded-Proto != "https") {
// This filter should exactly match our set of SSL cert
wildcards
if (req.http.Host ~
"(?i)^([^.]+\.)?(zero\.wikipedia|(m\.)?(wikipedia|wikibooks|wikinews|wikiquote|wikisource|wikiversity|wikivoyage|wikidata|wikimedia|wikimediafoundation|wiktionary|mediawiki)).org$")
{
- // For now, don't transition upload.wm.o yet...
- if (req.http.Host !~
"(?i)^upload\.wikimedia\.org$") {
- // For now, avoid matching these
"special" wikis for MW UAs
- // Ref: T102566 +
https://gerrit.wikimedia.org/r/218539
- if (req.http.Host !~
"(?i)^(commons|meta)\.wikimedia.org$" ||
- req.http.User-Agent !~
"^MediaWiki/") {
- set req.http.Location =
"https://"; + req.http.Host + req.url;
- error 751 "TLS Redirect";
- }
+ // For now, avoid matching these "special"
wikis for MW UAs
+ // Ref: T102566 +
https://gerrit.wikimedia.org/r/218539
+ if (req.http.Host !~
"(?i)^(commons|upload|meta)\.wikimedia.org$" ||
+ req.http.User-Agent !~ "^MediaWiki/") {
+ set req.http.Location = "https://"; +
req.http.Host + req.url;
+ error 751 "TLS Redirect";
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/218623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c6ccd94b03fbbaccdd4d3de08d31b86eac8f0eb
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
