From: Aurelien Jarno Date: Thu, 26 May 2016 23:28:05 +0000 (+0200) Subject: Drop wheezy compatibility code in static-vhosts-simple X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2c850ba95c1fa568ed381acd011f3386051f3fba;p=mirror%2Fdsa-puppet.git Drop wheezy compatibility code in static-vhosts-simple Signed-off-by: Aurelien Jarno --- 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 d971eca16..3feff61d8 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -149,12 +149,7 @@ lines.join("\n") AllowOverride FileInfo Indexes Options=Multiviews Options Multiviews Indexes FollowSymLinks Includes IndexOptions FancyIndexing NameWidth=* - <% if @lsbmajdistrelease > '7' -%> - Require all granted - <% else -%> - Order allow,deny - Allow from all - <% end -%> + Require all granted AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css