allow server_aliases to be either string or array

Author: raoulbhatia

manifests/resource/vhost.pp

@@ -99,6 +99,15 @@
     default => $groupowner,
   }
 
+  # convert server_aliases to an array
+  $array_server_aliases = is_array($server_aliases) ? {
+    false => $server_aliases ? {
+      '' => [],
+      default => [$server_aliases],
+    },
+    default => $server_aliases,
+  }
+
   $file_real = "${nginx::vdir}/${name}.conf"
 
   # Some OS specific settings:

templates/vhost/vhost_header.erb

@@ -2,7 +2,7 @@ server {
   listen <%= @listen_ip %><% if defined? @listen_port %>:<%= @listen_port %><% end %><% if @bool_default_server %> default_server<% end %>;
   <% # check to see if ipv6 support exists in the kernel before applying %>
   <% if @bool_ipv6_enable && (defined? @ipaddress6) %>listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> default ipv6only=on;<% end %>
-  server_name <%= @server_name %> <%= @server_aliases %>;
+  server_name <%= @server_name %> <%= Array(@array_server_aliases).join(' ') %>;
   access_log  <%= scope.lookupvar('nginx::log_dir')%>/<%= @name %>.access.log;
 
   <% if (defined? @www_root)  %>

templates/vhost/vhost_ssl_header.erb

@@ -1,7 +1,7 @@
 server {
   listen <%= @ssl_listen_ip %>:<%= @ssl_listen_port %><% if @bool_default_server %> default_server<% end %>;
   <% if @bool_ipv6_enable && (defined? @ipaddress6) %>listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> default ipv6only=on;<% end %>
-  server_name <%= @server_name %> <%= @server_aliases %>;
+  server_name <%= @server_name %> <%= Array(@array_server_aliases).join(' ') %>;
   access_log  <%= scope.lookupvar('nginx::log_dir')%>/<%= @name %>.access.log;
 
   ssl on;