Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/80314
Change subject: redirect http->https on etherpad.wikimedia.org
......................................................................
redirect http->https on etherpad.wikimedia.org
Change-Id: I1f76d409ce0c7ec92b993b6a2fb2515d5b8a2afb
---
M files/misc/etherpad/etherpad.proxy.apache.conf
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/80314/1
diff --git a/files/misc/etherpad/etherpad.proxy.apache.conf
b/files/misc/etherpad/etherpad.proxy.apache.conf
index f60d6bf..6c42629 100644
--- a/files/misc/etherpad/etherpad.proxy.apache.conf
+++ b/files/misc/etherpad/etherpad.proxy.apache.conf
@@ -2,10 +2,11 @@
ServerName etherpad-old.wikimedia.org
ServerAlias etherpad.wikimedia.org eiximenis.wikimedia.org
- RewriteEngine on
- ProxyPass / http://127.0.0.1:9000/
- ProxyPassReverse / http://127.0.0.1:9000/
- ProxyPreserveHost On
+
+ RewriteEngine On
+ RewriteCond %{HTTP_HOST} ^etherpad\.wikimedia\.org [NC]
+ RewriteCond %{HTTPS} off
+ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
</VirtualHost>
<VirtualHost *:443>
--
To view, visit https://gerrit.wikimedia.org/r/80314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f76d409ce0c7ec92b993b6a2fb2515d5b8a2afb
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
