Dzahn has submitted this change and it was merged.
Change subject: etherpad: remove SSL stanza
......................................................................
etherpad: remove SSL stanza
For move to behind misc, remove the SSL stanza from
etherpad.wikimedia.org.erb as this is no longer needed.
Bug: T85788
Change-Id: I359c2582ad5c28e222bae8d2038dda79c6e96965
---
M templates/misc/etherpad.wikimedia.org.erb
1 file changed, 1 insertion(+), 48 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/templates/misc/etherpad.wikimedia.org.erb
b/templates/misc/etherpad.wikimedia.org.erb
index a3a22c7..8a5b2f8 100644
--- a/templates/misc/etherpad.wikimedia.org.erb
+++ b/templates/misc/etherpad.wikimedia.org.erb
@@ -14,54 +14,7 @@
ProxyPass / http://<%= @etherpad_ip %>:<%= @etherpad_port %>/ retry=15
ProxyPassReverse / http://<%= @etherpad_ip %>:<%= @etherpad_port %>/
ProxyPreserveHost On
- RewriteRule /p/*$ https://<%= @etherpad_host %>/ [NC,L]
- RewriteCond %{REQUEST_URI} !^/locales/
- RewriteCond %{REQUEST_URI} !^/locales.json
- RewriteCond %{REQUEST_URI} !^/admin
- RewriteCond %{REQUEST_URI} !^/p/
- RewriteCond %{REQUEST_URI} !^/static/
- RewriteCond %{REQUEST_URI} !^/pluginfw/
- RewriteCond %{REQUEST_URI} !^/javascripts/
- RewriteCond %{REQUEST_URI} !^/socket.io/
- RewriteCond %{REQUEST_URI} !^/ep/
- RewriteCond %{REQUEST_URI} !^/minified/
- RewriteCond %{REQUEST_URI} !^/api/
- RewriteCond %{REQUEST_URI} !^/ro/
- RewriteCond %{REQUEST_URI} !^/error/
- RewriteCond %{REQUEST_URI} !^/jserror
- RewriteCond %{REQUEST_URI} !/favicon.ico
- RewriteCond %{REQUEST_URI} !/robots.txt
- RewriteRule ^/+(.+)$ https://<%= @etherpad_host %>/p/$1 [L]
-
- RewriteCond %{HTTP_HOST} !<%= @etherpad_host %>
- RewriteRule ^/+(.+)$ https://<%= @etherpad_host %>/$1 [R=301,L]
-
- <Proxy *>
- Options FollowSymLinks MultiViews
- AllowOverride All
- Order allow,deny
- Allow from all
- </Proxy>
-
-</VirtualHost>
-
-
-<VirtualHost *:443>
-
- ServerName <%= @etherpad_host %>
-
- SSLEngine on
- SSLCertificateFile <%= @etherpad_ssl_cert %>
- SSLCertificateKeyFile <%= @etherpad_ssl_key %>
- SSLCACertificatePath /etc/ssl/certs
- <%= @ssl_settings.join("\n") %>
-
- RewriteEngine on
- ProxyVia On
- ProxyRequests Off
- ProxyPass / http://<%= @etherpad_ip %>:<%= @etherpad_port %>/ retry=15
- ProxyPassReverse / http://<%= @etherpad_ip %>:<%= @etherpad_port %>/
- ProxyPreserveHost On
+ RewriteCond %{HTTP:X-Forwarded-Proto} !https
RewriteRule /p/*$ https://<%= @etherpad_host %>/ [NC,L]
RewriteCond %{REQUEST_URI} !^/locales/
RewriteCond %{REQUEST_URI} !^/locales.json
--
To view, visit https://gerrit.wikimedia.org/r/181413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I359c2582ad5c28e222bae8d2038dda79c6e96965
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
