Get rid of incorrectly-specified (and therefore unused SuppressDescription IndexOptions

diff --git a/modules/apache2/files/puppet-ftp-macros b/modules/apache2/files/puppet-ftp-macros
index 2796fec..73727d7 100644 (file)
--- 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 a4b1f9c..21bd9aa 100644 (file)
--- 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 90cbbba..d7cd67f 100644 (file)
--- 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 bebc6be..5e4588b 100644 (file)
--- 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