Merge pull request voxpupuli#19 from lboynton/server-name-array

Server name array

manifests/resource/vhost.pp

@@ -17,6 +17,7 @@
 #   [*ssl*]                 - Indicates whether to setup SSL bindings for this vhost.
 #   [*ssl_cert*]            - Pre-generated SSL Certificate file to reference for SSL Support. This is not generated by this module.
 #   [*ssl_key*]             - Pre-generated SSL Key file to reference for SSL Support. This is not generated by this module.
+#   [*server_name*]         - List of vhostnames for which this vhost will respond. Default [$name].
 #   [*www_root*]            - Specifies the location on disk for files to be read from. Cannot be set in conjunction with $proxy
 #   [*rewrite_www_to_non_www*]  - Adds a server directive and rewrite rule to rewrite www.domain.com to domain.com in order to avoid
 #                             duplicate content (SEO);
@@ -46,6 +47,7 @@
   $proxy              = undef,
   $proxy_read_timeout = $nginx::params::nx_proxy_read_timeout,
   $index_files        = ['index.html', 'index.htm', 'index.php'],
+  $server_name        = [$name],
   $www_root           = undef,
   $rewrite_www_to_non_www = false,
 ) {

templates/vhost/vhost_header.erb

@@ -4,5 +4,5 @@ server {
   <% if ipv6_enable == 'true' && (defined? ipaddress6) %>
   listen [<%= ipv6_listen_ip %>]:<%= ipv6_listen_port %> default ipv6only=on;
   <% end %>
-  server_name           <%= rewrite_www_to_non_www ? name.gsub(/^www\./, '') : name %>;
+  server_name           <%= rewrite_www_to_non_www ? name.gsub(/^www\./, '') : server_name.join(" ") %>;
   access_log            <%= scope.lookupvar('nginx::params::nx_logdir')%>/<%= name %>.access.log;