opendev/puppet-storyboard
Code Issues Proposed changes

Compare values to :undef to test for existence

Browse Source 
Change-Id: I87a7268ae56737a507faafb510801fd5b21a04d2
This commit is contained in:
Spencer Krum 2014-09-12 11:12:39 -07:00
parent 9d04e4d824
commit 8c4feb93f8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/storyboard_http.vhost.erb
View File

@ -1,5 +1,5 @@
<VirtualHost <%= scope.lookupvar("storyboard::application::hostname") %>:80>
<% if scope.lookupvar("storyboard::application::server_admin") %>
<% if scope.lookupvar("storyboard::application::server_admin") != :undef %>
ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %>
<% end %>
ServerName <%= scope.lookupvar("storyboard::application::hostname") %>

4
templates/storyboard_https.vhost.erb
View File

@ -1,5 +1,5 @@
<VirtualHost <%= scope.lookupvar("storyboard::application::hostname") %>:80>
<% if scope.lookupvar("storyboard::application::server_admin") %>
<% if scope.lookupvar("storyboard::application::server_admin") != :undef %>
ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %>
<% end %>
ServerName <%= scope.lookupvar("storyboard::application::hostname") %>
@ -15,7 +15,7 @@
</VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost <%= scope.lookupvar("storyboard::application::hostname") %>:443>
<% if scope.lookupvar("storyboard::application::server_admin") %>
<% if scope.lookupvar("storyboard::application::server_admin") != :undef %>
ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %>
<% end %>
ServerName <%= scope.lookupvar("storyboard::application::hostname") %>