From 3f34fa54c603b23c7ac470f88ebe568a21f2d6ed Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen.murphy@suse.de>
Date: Thu, 12 Jul 2018 14:32:27 +0200
Subject: [PATCH] Fix template variables

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

Change-Id: Iad51146400443fce963889d77eae3c6e4759d08c
---
 templates/drupal.vhost.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/drupal.vhost.erb b/templates/drupal.vhost.erb
index 5b99c7d..e84d2bd 100644
--- a/templates/drupal.vhost.erb
+++ b/templates/drupal.vhost.erb
@@ -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 %>