Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154980
Change subject: put racktables behind misc. varnish
......................................................................
put racktables behind misc. varnish
- add racktables to misc. varnish config
- add magnesium as a backend
- remove :443 part from Apache config template
Change-Id: I9c785bdc13aed890fb7446ff3091b8b5c31e94e1
---
M manifests/role/cache.pp
M templates/apache/sites/racktables.wikimedia.org.erb
M templates/varnish/misc.inc.vcl.erb
3 files changed, 3 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/154980/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 223e773..c3d6bcc 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1425,6 +1425,7 @@
'logstash1003.eqiad.wmnet',
'radon.eqiad.wmnet', # phab instance for legal
'iridium.eqiad.wmnet', # main phab
+ 'magnesium.wikimedia.org', # RT and racktables
],
backend_options => [
{
diff --git a/templates/apache/sites/racktables.wikimedia.org.erb
b/templates/apache/sites/racktables.wikimedia.org.erb
index 895072f..418980d 100644
--- a/templates/apache/sites/racktables.wikimedia.org.erb
+++ b/templates/apache/sites/racktables.wikimedia.org.erb
@@ -8,21 +8,6 @@
ServerName <%= @racktables_host %>
- RewriteEngine on
- RewriteRule ^/(.*)$ https://<%= @racktables_host %>/$1 [R=301]
-
-</VirtualHost>
-
-<VirtualHost *:443>
-
- ServerName <%= @racktables_host %>
-
- SSLEngine On
- SSLCertificateFile <%= @racktables_ssl_cert %>
- SSLCertificateKeyFile <%= @racktables_ssl_key %>
- SSLCACertificatePath /etc/ssl/certs
- <%= @ssl_settings.join("\n") %>
-
DocumentRoot /srv/org/wikimedia/racktables/wwwroot
<Directory />
Options FollowSymLinks
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index 2293b62..4b7647c 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -28,6 +28,8 @@
set req.backend = iridium;
} elsif (req.http.Host == "contacts.wikimedia.org") {
set req.backend = zirconium;
+ } elsif (req.http.Host == "racktables.wikimedia.org") {
+ set req.backend = magnesium;
} else {
error 404 "Domain not served here";
}
--
To view, visit https://gerrit.wikimedia.org/r/154980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c785bdc13aed890fb7446ff3091b8b5c31e94e1
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
