Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199641
Change subject: planet: use standard for http->https redirects
......................................................................
planet: use standard for http->https redirects
Just adjust this to be the same as the standard snippet
we use in several other places. Maybe this should be a
parser function like ssl_ciphersuite.
- do not redirect server status page
- set env=ProtoRedirect
Change-Id: I48546007610213f553234ee7938615a682a97a40
---
M modules/planet/templates/apache/planet-language.erb
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/199641/1
diff --git a/modules/planet/templates/apache/planet-language.erb
b/modules/planet/templates/apache/planet-language.erb
index 3728330..f605f64 100644
--- a/modules/planet/templates/apache/planet-language.erb
+++ b/modules/planet/templates/apache/planet-language.erb
@@ -7,8 +7,9 @@
RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} !https
+ RewriteCond %{REQUEST_URI} !^/status$
RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI}
[R=301,E=ProtoRedirect]
- Header always merge Vary X-Forwarded-Proto
+ Header always merge Vary X-Forwarded-Proto env=ProtoRedirect
<Directory /var/www/planet/<%= @name %>>
Allow from all
--
To view, visit https://gerrit.wikimedia.org/r/199641
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48546007610213f553234ee7938615a682a97a40
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
