Remove no-op DefaultType from apache config

apache 2.4 stopped respecting DefaultType.  Thanks, guys.

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index cc9ff05b0f2a8c84b8e1ce306d824265845574bc..6b857fc60a474bc2cacccd4d3f276c843bc1cd7d 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -44,7 +44,6 @@
 
        Header set Surrogate-Key <%= hostname %>
 
-       DefaultType text/plain
        AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 </Macro>
 

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 af78385947bcd2083db250b2e955eaf0707de06b..97ed145a3b00a66fb9742435748c6bb77e91cbf7 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -108,7 +108,6 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
                <% end -%>
        </Directory>
 
-       DefaultType text/plain
        AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
        AddOutputFilter INCLUDES .xhtml
 </VirtualHost>