From dcc876c7a92aa2b9e401310d28240b985345f35f Mon Sep 17 00:00:00 2001 From: K Jonathan Harker Date: Thu, 7 Jul 2016 16:36:29 -0700 Subject: [PATCH] Add ServerAlias support to the vhost config Change-Id: I04b232120531a91a3a402d7507c04979e24f0856 --- manifests/init.pp | 1 + templates/hound.vhost.erb | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 02d626c..f825e5e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -6,6 +6,7 @@ class hound ( $datadir = '/home/hound/data', $manage_config = true, $serveradmin = "webmaster@${::fqdn}", + $serveraliases = undef, $vhost_name = $::fqdn, ) { diff --git a/templates/hound.vhost.erb b/templates/hound.vhost.erb index f8f148e..56cd143 100644 --- a/templates/hound.vhost.erb +++ b/templates/hound.vhost.erb @@ -1,5 +1,10 @@ ServerName <%= scope.lookupvar("hound::vhost_name") %> +<% if @serveraliases.is_a? Array -%> +<% @serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %> +<% elsif @serveraliases -%> +<%= " ServerAlias #{@serveraliases}" %> +<% end %> ServerAdmin <%= @serveradmin %> ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("hound::vhost_name") %>-error.log