From 11ce678abbc8ed8f1a51489d1034238d633a2a9d Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 9 Feb 2017 09:18:49 +0100
Subject: [PATCH] Get rid of incorrectly-specified (and therefore unused
 SuppressDescription IndexOptions

---
 modules/apache2/files/puppet-ftp-macros                         | 2 +-
 modules/roles/templates/apache-archive.debian.org.erb           | 2 +-
 modules/roles/templates/apache-ftp.ports.debian.org.erb         | 2 +-
 .../roles/templates/syncproxy/syncproxy.debian.org-apache.erb   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/apache2/files/puppet-ftp-macros b/modules/apache2/files/puppet-ftp-macros
index 2796fec50..73727d792 100644
--- a/modules/apache2/files/puppet-ftp-macros
+++ b/modules/apache2/files/puppet-ftp-macros
@@ -3,7 +3,7 @@
     <Macro ftp-archive $root>
       <Directory $root>
         Require all granted
-        IndexOptions NameWidth=* +SuppressDescription
+        IndexOptions NameWidth=*
         Options +Indexes +FollowSymLinks
         FileETag MTime Size
       </Directory>
diff --git a/modules/roles/templates/apache-archive.debian.org.erb b/modules/roles/templates/apache-archive.debian.org.erb
index a4b1f9cf0..21bd9aa0a 100644
--- a/modules/roles/templates/apache-archive.debian.org.erb
+++ b/modules/roles/templates/apache-archive.debian.org.erb
@@ -19,7 +19,7 @@
 
 	<Directory <%= archive_root %>>
 		Require all granted
-		IndexOptions NameWidth=* +SuppressDescription
+		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 90cbbbab3..d7cd67fbf 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -21,7 +21,7 @@
 	Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
 	<Directory /srv/mirrors/debian-ports-cd>
 		Require all granted
-		IndexOptions NameWidth=* +SuppressDescription
+		IndexOptions NameWidth=*
 		Options +Indexes
 		Options +FollowSymLinks
 	</Directory>
diff --git a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
index bebc6be31..5e4588b25 100644
--- a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
+++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
@@ -32,7 +32,7 @@ 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=* +SuppressDescription"
+    lines << "    IndexOptions NameWidth=*"
     lines << "    Options +Indexes"
     lines << "  </Directory>"
   end
-- 
2.20.1