Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/78957
Change subject: Force epl.wikimedia.org -> etherpad.wikimedia.org
......................................................................
Force epl.wikimedia.org -> etherpad.wikimedia.org
Plus whitespace cleanup
Change-Id: I1c70c381e11178e94c99661a81533b944aeb6375
---
M templates/apache/sites/etherpad_lite.wikimedia.org.erb
1 file changed, 10 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/78957/1
diff --git a/templates/apache/sites/etherpad_lite.wikimedia.org.erb
b/templates/apache/sites/etherpad_lite.wikimedia.org.erb
index f52858f..c092b3f 100644
--- a/templates/apache/sites/etherpad_lite.wikimedia.org.erb
+++ b/templates/apache/sites/etherpad_lite.wikimedia.org.erb
@@ -7,10 +7,9 @@
<VirtualHost *:80>
ServerName <%= etherpad_host %>
- <% if etherpad_serveraliases -%>
+<% if etherpad_serveraliases -%>
ServerAlias <%= etherpad_serveraliases %>
- <% end -%>
-
+<% end -%>
RewriteEngine on
ProxyVia On
@@ -37,6 +36,9 @@
RewriteCond %{REQUEST_URI} !/robots.txt
RewriteRule ^/+(.+)$ https://etherpad.wikimedia.org/p/$1 [L]
+ RewriteCond %{HTTP_HOST} !etherpad.wikimedia.org
+ RewriteRule ^/+(.+)$ https://etherpad.wikimedia.org/$1 [R=301,L]
+
<Proxy *>
Options FollowSymLinks MultiViews
AllowOverride All
@@ -49,9 +51,9 @@
<VirtualHost *:443>
ServerName <%= etherpad_host %>
- <% if etherpad_serveraliases -%>
+<% if etherpad_serveraliases -%>
ServerAlias <%= etherpad_serveraliases %>
- <% end -%>
+<% end -%>
SSLEngine on
SSLProtocol -ALL +SSLv3 +TLSv1
@@ -85,6 +87,9 @@
RewriteCond %{REQUEST_URI} !/robots.txt
RewriteRule ^/+(.+)$ https://etherpad.wikimedia.org/p/$1 [L]
+ RewriteCond %{HTTP_HOST} !etherpad.wikimedia.org
+ RewriteRule ^/+(.+)$ https://etherpad.wikimedia.org/$1 [R=301,L]
+
<Proxy *>
Options FollowSymLinks MultiViews
AllowOverride All
--
To view, visit https://gerrit.wikimedia.org/r/78957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c70c381e11178e94c99661a81533b944aeb6375
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
