opendev/puppet-storyboard
Code Issues Proposed changes

Wildcard the VirtualHost directive addresses

Browse Source 
On systems where the site FQDN is mapped to the loopback interface
in /etc/hosts, Apache doesn't apply the vhost configuration on
incoming connections to other addresses/interfaces. Apache
recommends wildcarding VirtualHost directives these days, and it's
something we already hard-code in other modules (e.g. puppet-zuul).

This _could_ conceivably cause complication for anyone trying to
coinstall this module on a server hosting other sites without
name-based hosting configured correctly, but that should be an
increasingly unusual configuration.

Change-Id: I11f5b586c4f7b42017c2eb78af4be87211343381
This commit is contained in:
Jeremy Stanley 2016-05-18 20:41:10 +00:00
parent edfb6b3bef
commit 762bed13d4
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,4 +1,4 @@
<VirtualHost <%= scope.lookupvar("storyboard::application::hostname") %>:80> <VirtualHost *:80>
<% if scope.lookupvar("storyboard::application::server_admin") != :undef %> <% if scope.lookupvar("storyboard::application::server_admin") != :undef %>
ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %> ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %>
<% end %> <% end %>

4
templates/storyboard_https.vhost.erb
View File

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