From: Julien Cristau Date: Wed, 12 Aug 2015 18:06:56 +0000 (+0200) Subject: Remove no-op DefaultType from apache config X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6a936e490d0b1057ab5e88cda475c5c36a7cde35;p=mirror%2Fdsa-puppet.git 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 cc9ff05b0..6b857fc60 100644 --- 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 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 af7838594..97ed145a3 100644 --- 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 -%> - DefaultType text/plain AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css AddOutputFilter INCLUDES .xhtml