John F. Lewis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181268
Change subject: etherpad: move behind misc-lb.eqiad
......................................................................
etherpad: move behind misc-lb.eqiad
Move etherpad behind misc and remove SSL configuration
as Varnish/misc handles SSL termination.
DNS: Ie3f58fb356a9cc02a3f80e11df52f9e417d8f260
Bug: T60048
Change-Id: I7687a89b8b8b0058941be3db8c09fce234ab1041
---
M templates/misc/etherpad.wikimedia.org.erb
M templates/varnish/misc.inc.vcl.erb
2 files changed, 3 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/181268/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>
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index a407513..8249415 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -49,6 +49,9 @@
return (pass);
} elsif (req.http.Host == "noc.wikimedia.org") {
set req.backend = terbium;
+ } elsif (req.http.Host == "etherpad.wikimedia.org") {
+ set req.backend = zirconium;
+ return (pass);
} else {
error 404 "Domain not served here";
}
--
To view, visit https://gerrit.wikimedia.org/r/181268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7687a89b8b8b0058941be3db8c09fce234ab1041
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
