From 6db93dac50bb27e6b899041e1bbb8518bd693c6e Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Tue, 17 Dec 2013 12:18:45 -0500
Subject: [PATCH] Remove index parameters.

The current code allows you to set index_options but then ignores it.
Based on the git log for the commit that added this option it was
intended to be passed into directories.  The test that caught this
will be merged into spec/acceptance/vhost_spec.rb in a seperate PR.

You can reproduce the original failure with:

class { 'apache': }
host { 'test.server': ip => '127.0.0.1' }
apache::vhost { 'test.server':
  docroot    => '/tmp',
  index_options    => ['Charset=UTF-8'],
}

We're just going to remove them because they can be passed directly
into directory instead of indirectly.
---
 manifests/vhost.pp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 641962d582..0cdec4871a 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -114,8 +114,6 @@
     $servername                  = $name,
     $serveraliases               = [],
     $options                     = ['Indexes','FollowSymLinks','MultiViews'],
-    $index_options               = [],
-    $index_order_default         = [],
     $override                    = ['None'],
     $directoryindex              = '',
     $vhost_name                  = '*',