John F. Lewis has uploaded a new change for review. https://gerrit.wikimedia.org/r/181413
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. Change-Id: I359c2582ad5c28e222bae8d2038dda79c6e96965 --- M templates/misc/etherpad.wikimedia.org.erb 1 file changed, 0 insertions(+), 48 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/13/181413/1 diff --git a/templates/misc/etherpad.wikimedia.org.erb b/templates/misc/etherpad.wikimedia.org.erb index a3a22c7..c908dc2 100644 --- a/templates/misc/etherpad.wikimedia.org.erb +++ b/templates/misc/etherpad.wikimedia.org.erb @@ -44,51 +44,3 @@ </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 - 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> -- To view, visit https://gerrit.wikimedia.org/r/181413 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I359c2582ad5c28e222bae8d2038dda79c6e96965 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: John F. Lewis <johnflewi...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits