From 8cb841cb64ee9d3fae1dd9fb8854ab6091c8210f Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 12 Sep 2018 15:59:05 -0700 Subject: [PATCH] Fix second ServerAdmin conditional There are two ServerAdmin entries in the https vhost erb template. One for port 80 and one for port 443. The previous change only fixed the issue for port 80. Fix this for port 443 too. Additionally fix the ssl chain file variable which has the same problem. Change-Id: Id3a36d1a3088f9ae08761f51f4073f388e2eedf8 --- templates/storyboard_https.vhost.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/storyboard_https.vhost.erb b/templates/storyboard_https.vhost.erb index 2f05e08..f4510be 100644 --- a/templates/storyboard_https.vhost.erb +++ b/templates/storyboard_https.vhost.erb @@ -15,7 +15,7 @@ - <% if scope.lookupvar("storyboard::application::server_admin") != :undef %> + <% if ! [nil, :undef].include?(scope.lookupvar("storyboard::application::server_admin")) %> ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %> <% end %> ServerName <%= scope.lookupvar("storyboard::application::hostname") %> @@ -31,7 +31,7 @@ SSLCertificateFile <%= scope.lookupvar("storyboard::cert::ssl_cert") %> SSLCertificateKeyFile <%= scope.lookupvar("storyboard::cert::ssl_key") %> - <% if scope.lookupvar("storyboard::cert::resolved_ssl_ca") != :undef %> + <% if ! [nil, :undef].include?(scope.lookupvar("storyboard::cert::resolved_ssl_ca")) %> SSLCertificateChainFile <%= scope.lookupvar("storyboard::cert::resolved_ssl_ca") %> <% end %>