From: Héctor Orón Martínez Date: Sat, 14 Dec 2013 01:57:32 +0000 (+0100) Subject: Serve xhtml from generic cofiguration X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=898ea78774b44c2023e8ea91869b3af23a82c416 Serve xhtml from generic cofiguration Signed-off-by: Héctor Orón Martínez --- diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb index e3aceae7..2e79bcbd 100644 --- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb +++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb @@ -9,7 +9,7 @@ DocumentRoot /srv/static.debian.org/mirrors/$name/cur AllowOverride FileInfo Indexes Options=Multiviews - Options Multiviews Indexes FollowSymLinks + Options Multiviews Indexes FollowSymLinks Includes IndexOptions FancyIndexing NameWidth=* Order allow,deny Allow from all @@ -17,6 +17,7 @@ DefaultType text/plain AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css + AddOutputFilter INCLUDES .xhtml 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 10c820c0..4088d28d 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -59,10 +59,3 @@ Use common-static-vhost-with-extra www.ports.debian.org "ServerAlias www.ports-b ServerAdmin debian-admin@debian.org RedirectPermanent / http://www.ports.debian.org/ - - > - ServerName ports.debian.org - ServerAdmin debian-admin@debian.org - Options MultiViews Includes - AddOutputFilter INCLUDES .xhtml -