Serve xhtml from generic cofiguration

Signed-off-by: Héctor Orón Martínez <zumbi@debian.org>

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index e3aceae7bef443d895c06523cbaae92808417e06..2e79bcbdd96deea22fa5d76654bd282d44a79ab2 100644 (file)
--- 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
        <Directory /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
 </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 10c820c007f7298126a26281f77654807deb2f4c..4088d28da2b362052a00272e8cb2db521160d8ac 100644 (file)
--- 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/
 </VirtualHost>
-
-<VirtualHost <%= vhost_listen %> >
-       ServerName ports.debian.org
-       ServerAdmin debian-admin@debian.org
-       Options MultiViews Includes
-       AddOutputFilter INCLUDES .xhtml
-</VirtualHost>