opendev/puppet-drupal
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: Iad51146400443fce963889d77eae3c6e4759d08c
This commit is contained in:
Colleen Murphy 2018-07-12 14:32:27 +02:00 committed by Clark Boylan
parent a7d33ab524
commit 3f34fa54c6
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/drupal.vhost.erb
View File

@ -23,7 +23,7 @@ NameVirtualHost <%= @vhost_name %>:443
ServerName <%= @srvname %>
<% if @serveraliases.is_a? Array -%>
<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
<% elsif @serveraliases != '' -%>
<% elsif ! ['', nil].include?(@serveraliases) -%>
<%= " ServerAlias #{@serveraliases}" %>
<% end -%>
DocumentRoot <%= @docroot %>