opendev/puppet-storyboard
Code Issues Proposed changes

Fix second ServerAdmin conditional

Browse Source 
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
This commit is contained in:
Clark Boylan 2018-09-12 15:59:05 -07:00
parent 4ef66c2bee
commit 8cb841cb64
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/storyboard_https.vhost.erb
View File

@ -15,7 +15,7 @@
</VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost *:443>
<% 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 %>