Browse Source

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
changes/97/602197/2
Clark Boylan 8 months ago
parent
commit
8cb841cb64
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      templates/storyboard_https.vhost.erb

+ 2
- 2
templates/storyboard_https.vhost.erb View File

@@ -15,7 +15,7 @@
15 15
 </VirtualHost>
16 16
 <IfModule mod_ssl.c>
17 17
   <VirtualHost *:443>
18
-  <% if scope.lookupvar("storyboard::application::server_admin") != :undef %>
18
+  <% if ! [nil, :undef].include?(scope.lookupvar("storyboard::application::server_admin")) %>
19 19
     ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %>
20 20
   <% end %>
21 21
     ServerName <%= scope.lookupvar("storyboard::application::hostname") %>
@@ -31,7 +31,7 @@
31 31
 
32 32
     SSLCertificateFile      <%= scope.lookupvar("storyboard::cert::ssl_cert") %>
33 33
     SSLCertificateKeyFile   <%= scope.lookupvar("storyboard::cert::ssl_key") %>
34
-  <% if scope.lookupvar("storyboard::cert::resolved_ssl_ca") != :undef %>
34
+  <% if ! [nil, :undef].include?(scope.lookupvar("storyboard::cert::resolved_ssl_ca")) %>
35 35
     SSLCertificateChainFile <%= scope.lookupvar("storyboard::cert::resolved_ssl_ca") %>
36 36
   <% end %>
37 37
 

Loading…
Cancel
Save