From 27e5ca03d936794fba94a521de8cf93148a7cb31 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 9 Feb 2017 09:44:18 +0100
Subject: [PATCH] Remove redundant IndexOptions from all vhosts

---
 modules/apache2/files/puppet-ftp-macros                        | 1 -
 modules/roles/files/dgit/git.dgit.debian.org                   | 1 -
 modules/roles/templates/apache-archive.debian.org.erb          | 1 -
 modules/roles/templates/apache-ftp.ports.debian.org.erb        | 1 -
 modules/roles/templates/static-mirroring/static-vhost.conf.erb | 1 -
 .../templates/static-mirroring/vhost/static-vhosts-simple.erb  | 3 ---
 .../roles/templates/syncproxy/syncproxy.debian.org-apache.erb  | 1 -
 7 files changed, 9 deletions(-)

diff --git a/modules/apache2/files/puppet-ftp-macros b/modules/apache2/files/puppet-ftp-macros
index 73727d792..304dc7af0 100644
--- a/modules/apache2/files/puppet-ftp-macros
+++ b/modules/apache2/files/puppet-ftp-macros
@@ -3,7 +3,6 @@
     <Macro ftp-archive $root>
       <Directory $root>
         Require all granted
-        IndexOptions NameWidth=*
         Options +Indexes +FollowSymLinks
         FileETag MTime Size
       </Directory>
diff --git a/modules/roles/files/dgit/git.dgit.debian.org b/modules/roles/files/dgit/git.dgit.debian.org
index fd77f190b..5826517bd 100644
--- a/modules/roles/files/dgit/git.dgit.debian.org
+++ b/modules/roles/files/dgit/git.dgit.debian.org
@@ -19,7 +19,6 @@ Use common-debian-service-https-redirect * git.dgit.debian.org
 	<Directory /srv/dgit.debian.org/unpriv/repos>
 		AllowOverride None
 		Options SymlinksIfOwnerMatch Indexes
-		IndexOptions FancyIndexing NameWidth=*
 	</Directory>
 
 	SetEnv GIT_PROJECT_ROOT /srv/dgit.debian.org/unpriv/repos
diff --git a/modules/roles/templates/apache-archive.debian.org.erb b/modules/roles/templates/apache-archive.debian.org.erb
index 21bd9aa0a..e405bb353 100644
--- a/modules/roles/templates/apache-archive.debian.org.erb
+++ b/modules/roles/templates/apache-archive.debian.org.erb
@@ -19,7 +19,6 @@
 
 	<Directory <%= archive_root %>>
 		Require all granted
-		IndexOptions NameWidth=*
 		Options +Indexes +FollowSymLinks
 	</Directory>
 
diff --git a/modules/roles/templates/apache-ftp.ports.debian.org.erb b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index d7cd67fbf..458a83e4b 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -21,7 +21,6 @@
 	Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
 	<Directory /srv/mirrors/debian-ports-cd>
 		Require all granted
-		IndexOptions NameWidth=*
 		Options +Indexes
 		Options +FollowSymLinks
 	</Directory>
diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 89f6c3e31..5b2eb4db3 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -24,7 +24,6 @@
 	<Directory /srv/static.debian.org/mirrors/$name/cur>
 		AllowOverride FileInfo Indexes Options=Multiviews
 		Options Indexes SymLinksIfOwnerMatch
-		IndexOptions FancyIndexing NameWidth=*
 		Require all granted
 	</Directory>
 
diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 0749d363f..48b1d803f 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -32,7 +32,6 @@
 	<Directory /srv/static.debian.org/mirrors/deb.debian.org/cur>
 		AllowOverride FileInfo Indexes Options=Multiviews
 		Options Indexes SymLinksIfOwnerMatch
-		IndexOptions FancyIndexing NameWidth=*
 		Require all granted
 	</Directory>
 
@@ -82,7 +81,6 @@
 	<Directory /srv/static.debian.org/mirrors/release.debian.org-pu/cur>
 		Require all granted
 		Options Indexes SymLinksIfOwnerMatch MultiViews
-		IndexOptions FancyIndexing NameWidth=*
 
 		AddEncoding gzip .gz
 		FilterDeclare gzip CONTENT_SET
@@ -103,7 +101,6 @@
 	<Directory /srv/static.debian.org/mirrors/www.ports.debian.org/cur>
 		AllowOverride FileInfo Indexes Options=Multiviews
 		Options Multiviews Indexes FollowSymLinks Includes
-		IndexOptions FancyIndexing NameWidth=*
 		Require all granted
 	</Directory>
 
diff --git a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
index 5e4588b25..b1a953838 100644
--- a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
+++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
@@ -32,7 +32,6 @@ lines = []
     lines << "  Alias /#{archive}/project/trace/ /srv/mirrors/#{archive}/project/trace/"
     lines << "  <Directory /srv/mirrors/#{archive}/project/trace/>"
     lines << "    Require all granted"
-    lines << "    IndexOptions NameWidth=*"
     lines << "    Options +Indexes"
     lines << "  </Directory>"
   end
-- 
2.20.1