summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2018-09-12 15:59:05 -0700
committerClark Boylan <clark.boylan@gmail.com>2018-09-12 16:01:15 -0700
commit8cb841cb64ee9d3fae1dd9fb8854ab6091c8210f (patch)
treeb1e6229e84b2f3680fa7558292033691e15c8a99
parent4ef66c2bee40f00d475375cad6b9cb6003fc324a (diff)
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
Notes
Notes (review): Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 12 Sep 2018 23:41:25 +0000 Reviewed-on: https://review.openstack.org/602197 Project: openstack-infra/puppet-storyboard Branch: refs/heads/master
-rw-r--r--templates/storyboard_https.vhost.erb4
1 files 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 @@
15</VirtualHost> 15</VirtualHost>
16<IfModule mod_ssl.c> 16<IfModule mod_ssl.c>
17 <VirtualHost *:443> 17 <VirtualHost *:443>
18 <% if scope.lookupvar("storyboard::application::server_admin") != :undef %> 18 <% if ! [nil, :undef].include?(scope.lookupvar("storyboard::application::server_admin")) %>
19 ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %> 19 ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %>
20 <% end %> 20 <% end %>
21 ServerName <%= scope.lookupvar("storyboard::application::hostname") %> 21 ServerName <%= scope.lookupvar("storyboard::application::hostname") %>
@@ -31,7 +31,7 @@
31 31
32 SSLCertificateFile <%= scope.lookupvar("storyboard::cert::ssl_cert") %> 32 SSLCertificateFile <%= scope.lookupvar("storyboard::cert::ssl_cert") %>
33 SSLCertificateKeyFile <%= scope.lookupvar("storyboard::cert::ssl_key") %> 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 SSLCertificateChainFile <%= scope.lookupvar("storyboard::cert::resolved_ssl_ca") %> 35 SSLCertificateChainFile <%= scope.lookupvar("storyboard::cert::resolved_ssl_ca") %>
36 <% end %> 36 <% end %>
37 37