From 762bed13d43a8eae2bfedef03e93455fa08da333 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 18 May 2016 20:41:10 +0000 Subject: [PATCH] Wildcard the VirtualHost directive addresses 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 --- templates/storyboard_http.vhost.erb | 2 +- templates/storyboard_https.vhost.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/storyboard_http.vhost.erb b/templates/storyboard_http.vhost.erb index efa7a19..17e0893 100644 --- a/templates/storyboard_http.vhost.erb +++ b/templates/storyboard_http.vhost.erb @@ -1,4 +1,4 @@ -:80> + <% if scope.lookupvar("storyboard::application::server_admin") != :undef %> ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %> <% end %> diff --git a/templates/storyboard_https.vhost.erb b/templates/storyboard_https.vhost.erb index ef18af3..221499c 100644 --- a/templates/storyboard_https.vhost.erb +++ b/templates/storyboard_https.vhost.erb @@ -1,4 +1,4 @@ -:80> + <% if scope.lookupvar("storyboard::application::server_admin") != :undef %> ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %> <% end %> @@ -14,7 +14,7 @@ - :443> + <% if scope.lookupvar("storyboard::application::server_admin") != :undef %> ServerAdmin <%= scope.lookupvar("storyboard::application::server_admin") %> <% end %>