Dzahn has submitted this change and it was merged.
Change subject: doc.wikimedia.org: fix DirectorySlash https->http
......................................................................
doc.wikimedia.org: fix DirectorySlash https->http
Just like I577c65b5021b9b9cec and reported by Glaisher,
disables DirectorySlash and adds redirect rules to add slashes
to directories to avoid https->http redirects.
Bug: T95164
Change-Id: Ie93744f369f5da3056c7c17c1b142ba26fe8ec2a
---
M modules/contint/templates/apache/doc.wikimedia.org.erb
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/contint/templates/apache/doc.wikimedia.org.erb
b/modules/contint/templates/apache/doc.wikimedia.org.erb
index ac2cb0f..4c78970 100644
--- a/modules/contint/templates/apache/doc.wikimedia.org.erb
+++ b/modules/contint/templates/apache/doc.wikimedia.org.erb
@@ -26,9 +26,13 @@
RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} !https
RewriteRule (.) https://doc.wikimedia.org%{REQUEST_URI} [R=301]
-
Header always merge Vary X-Forwarded-Proto
+ # T95164
+ DirectorySlash Off
+ RewriteCond %{REQUEST_FILENAME} -d
+ RewriteRule ^(.+[^/])$ https://doc.wikimedia.org/$1/ [R=301,QSA]
+
# Enable HTTP Strict Transport Security
Header always set Strict-Transport-Security "max-age=31536000"
--
To view, visit https://gerrit.wikimedia.org/r/206832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie93744f369f5da3056c7c17c1b142ba26fe8ec2a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Glaisher <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: John F. Lewis <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
