opendev
/
puppet-storyboard
Code Issues Proposed changes

Spell 'server_admin' consistently 

The template and manifest used different spellings.

Change-Id: I093f7adfbfca1db040b73af96f8fb11adcb1699b
This commit is contained in:
James E. Blair 2014-09-12 10:53:48 -07:00
parent bca18fff5b
commit 9d04e4d824
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/storyboard_http.vhost.erb
View File

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

8
templates/storyboard_https.vhost.erb
View File

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