BBlack has submitted this change and it was merged.

Change subject: bugfix to HTTPS redirect regex
......................................................................


bugfix to HTTPS redirect regex

Change-Id: I1c9d07af9eec05b1a7f439cdb0d5ab77a39deb82
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 15d4ab8..7ede611 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -194,7 +194,7 @@
                if (req.http.X-Forwarded-Proto != "https") {
                        // This is all of our unified cert wildcard domains 
which are TLS-clean (cert matches all extant hostnames within)
                        // The lone exception now is wikimedia.org, in the next 
block
-                       if (req.http.Host ~ 
"(?i)^(^|\.)(wikipedia|wikibooks|wikinews|wikiquote|wikisource|wikiversity|wikivoyage|wikidata|wikimediafoundation|wiktionary|mediawiki)\.org$")
 {
+                       if (req.http.Host ~ 
"(?i)(^|\.)(wikipedia|wikibooks|wikinews|wikiquote|wikisource|wikiversity|wikivoyage|wikidata|wikimediafoundation|wiktionary|mediawiki)\.org$")
 {
                                set req.http.Location = "https://"; + 
req.http.Host + req.url;
                                error 751 "TLS Redirect";
                        }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c9d07af9eec05b1a7f439cdb0d5ab77a39deb82
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to