Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Fix quoting error in generic_vhost.erb
......................................................................
Fix quoting error in generic_vhost.erb
This change fixes a regression introduced by change
I9a502bfa2ebced111fd3f990cafef188f39995f8 and adjusts the indentation.
Apparently there is currently only one use of this template in
manifests/misc/statistics.pp, and that does not utilize "ssl =>
'true'", so this change should not make any SSL webservers
unexpectedly appear from nowhere.
Change-Id: I550489752afa36e46e966ccfdc7ece9fded838db
---
M templates/apache/generic_vhost.erb
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/apache/generic_vhost.erb
b/templates/apache/generic_vhost.erb
index 026b2c3..a8ea804 100644
--- a/templates/apache/generic_vhost.erb
+++ b/templates/apache/generic_vhost.erb
@@ -34,12 +34,12 @@
</VirtualHost>
<% end -%>
-<% if ["true", "only", "redirected"].include?("ssl") -%>
+<% if ["true", "only", "redirected"].include?(ssl) -%>
<VirtualHost *:443>
ServerName <%= title %>
- <% if aliases.length > 0 -%>
+<% if aliases.length > 0 -%>
ServerAlias <%= aliases.join(" ") %>
- <% end -%>
+<% end -%>
ServerAdmin r...@wikimedia.org
SSLEngine on
--
To view, visit https://gerrit.wikimedia.org/r/102862
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I550489752afa36e46e966ccfdc7ece9fded838db
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
