Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160585
Change subject: redirect http->https on ishmael
......................................................................
redirect http->https on ishmael
also enforce https here on ishmael,
which is behind misc. varnish / nginx now
currently no data in ishmael but we likely want to
use it again later
Change-Id: I90530a97a0d7750406459eccd8a24a44d4074ec9
---
M modules/cdh
M modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/160585/1
diff --git a/modules/cdh b/modules/cdh
index 63dd3e9..80dd7cb 160000
--- a/modules/cdh
+++ b/modules/cdh
-Subproject commit 63dd3e95c82885dee15654dc4cb2db38d77997d8
+Subproject commit 80dd7cbdf860a6f6a9d1574406b65e04735c07b1
diff --git a/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
b/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
index 6a2f7a9..8e7c65e 100644
--- a/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
+++ b/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
@@ -7,6 +7,12 @@
ServerName <%= @site_name %>
DocumentRoot <%= @docroot %>
+ 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 env=ProtoRedirect
+
<Directory "<%= @docroot %>">
Options FollowSymLinks
Options ExecCGI
--
To view, visit https://gerrit.wikimedia.org/r/160585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90530a97a0d7750406459eccd8a24a44d4074ec9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
