Ryan Lane has submitted this change and it was merged.
Change subject: Ganglia: Only define a 443 vhost if a cert is set
......................................................................
Ganglia: Only define a 443 vhost if a cert is set
Change-Id: I989044ead91d3f2645bb6784fda4db1dad87e125
---
M templates/apache/sites/ganglia.wikimedia.org.erb
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Ryan Lane: Verified; Looks good to me, approved
diff --git a/templates/apache/sites/ganglia.wikimedia.org.erb
b/templates/apache/sites/ganglia.wikimedia.org.erb
index 84dcc64..4bebcab 100644
--- a/templates/apache/sites/ganglia.wikimedia.org.erb
+++ b/templates/apache/sites/ganglia.wikimedia.org.erb
@@ -18,6 +18,7 @@
ErrorLog /var/log/apache2/error.log
LogLevel warn
</VirtualHost>
+<% if @ganglia_ssl_cert %>
<VirtualHost *:443>
ServerName <%= ganglia_servername %>
ServerAlias <%= ganglia_serveralias %>
@@ -42,3 +43,4 @@
ErrorLog /var/log/apache2/error.log
LogLevel warn
</VirtualHost>
+<% end %>
--
To view, visit https://gerrit.wikimedia.org/r/62111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I989044ead91d3f2645bb6784fda4db1dad87e125
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: Ryan Lane <rl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
