opendev/puppet-kibana
Code Issues Proposed changes

Fix template variables

Browse Source 
When serveraliases is not defined it should evaluate to nil, not ''.
Check for both to cover our bases.

Change-Id: Ie69baf01963f33cf695a0de763af75dc33b67daa
This commit is contained in:
Colleen Murphy 2018-07-12 14:34:40 +02:00
parent 4902600dd1
commit 74e6af7fd7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/dual-elasticsearch.vhost.erb
View File

@ -3,7 +3,7 @@
ServerAdmin <%= @serveradmin %>
<% if @serveraliases.is_a? Array %>
<% @serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %>
<% elsif @serveraliases != '' %>
<% elsif ! ['', nil].include?(@serveraliases) %>
<%= " ServerAlias #{@serveraliases}" %>
<% end %>