BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284803
Change subject: ganglia web: HTTP->HTTPS redir
......................................................................
ganglia web: HTTP->HTTPS redir
This also removes the conditional on the HTTPS config (before, it
was possible to undefine ganglia_ssl_cert and have HTTP-only)
Bug: T132521
Change-Id: I6d7ed492f531c8dca4ace7c02c1b8b74f74a03e5
---
M modules/ganglia/templates/ganglia.wikimedia.org.erb
1 file changed, 2 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/284803/1
diff --git a/modules/ganglia/templates/ganglia.wikimedia.org.erb
b/modules/ganglia/templates/ganglia.wikimedia.org.erb
index ad1d834..56f9ddd 100644
--- a/modules/ganglia/templates/ganglia.wikimedia.org.erb
+++ b/modules/ganglia/templates/ganglia.wikimedia.org.erb
@@ -1,23 +1,9 @@
<VirtualHost *:80>
ServerName <%= @ganglia_servername %>
ServerAlias <%= @ganglia_serveralias %>
- DocumentRoot <%= @doc_root %>
- ServerAdmin [email protected]
-
- <Directory "<%= @doc_root %>">
- Options FollowSymLinks
- AllowOverride None
- Require all granted
- </Directory>
-
- Alias /latest <%= @ganglia_webdir %>
-
- RedirectMatch ^/$ http://<%= @ganglia_servername %>/latest
- CustomLog /var/log/apache2/ganglia.wikimedia.org-access.log wmf
- ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log
- LogLevel warn
+ RewriteEngine on
+ RewriteRule ^/(.*)$ https://<%= @ganglia_servername %>/$1 [R=301]
</VirtualHost>
-<% if @ganglia_ssl_cert %>
<VirtualHost *:443>
ServerName <%= @ganglia_servername %>
ServerAlias <%= @ganglia_serveralias %>
@@ -43,4 +29,3 @@
ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log
LogLevel warn
</VirtualHost>
-<% end %>
--
To view, visit https://gerrit.wikimedia.org/r/284803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d7ed492f531c8dca4ace7c02c1b8b74f74a03e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
