Fixup incorrect changes from merge

manifests/resource/vhost.pp

@@ -3,7 +3,6 @@
 # This definition creates a virtual host
 #
 # Parameters:
-#   [*server_name*]         - Server name (value to match in Host: header). Defaults to the resource's name.
 #   [*ensure*]              - Enables or disables the specified vhost (present|absent)
 #   [*listen_ip*]           - Default IP Address for NGINX to listen with this vHost on. Defaults to all interfaces (*)
 #   [*listen_port*]         - Default IP Port for NGINX to listen with this vHost on. Defaults to TCP 80
@@ -41,7 +40,6 @@
 #    ssl_key  => '/tmp/server.pem',
 #  }
 define nginx::resource::vhost(
-  $server_name            = $name,
   $ensure                 = 'enable',
   $listen_ip              = '*',
   $listen_port            = '80',

templates/vhost/vhost_location_directory.erb

@@ -3,12 +3,9 @@
     <%= key %> <%= value %>;
 <% end -%><% end -%>
     root  <%= www_root %>;
-    index <% index_files.each do |i| %> <%= i %> <% end %>;
-
     <% if has_variable?("try_files") then %>
     try_files <% try_files.each do |try| -%> <%= try %> <% end -%>;
     <% end %>
-
     index <% index_files.each do |i| %> <%= i %> <% end %>; 
 <% if @location_cfg_append -%><% location_cfg_append.each do |key,value| -%>
     <%= key %> <%= value %>;

templates/vhost/vhost_ssl_header.erb

@@ -1,7 +1,9 @@
 server {
   listen       <%= ssl_port %>;
-  <% if ipv6_enable == 'true' && (defined? ipaddress6) %>listen [<%= ipv6_listen_ip %>]:<%= ipv6_listen_port %> default ipv6only=on;<% end %>
-  server_name  <%= server_name %>;
+  <% if ipv6_enable == 'true' && (defined? ipaddress6) %>
+  listen [<%= ipv6_listen_ip %>]:<%= ipv6_listen_port %> <% if @ipv6_listen_options %><%= ipv6_listen_options %><% end %> ipv6only=on;
+  <% end %>
+  server_name  <%= rewrite_www_to_non_www ? name.gsub(/^www\./, '') : server_name.join(" ") %>;
 
   ssl on;
   ssl_certificate      <%= ssl_cert %>;