From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 14 Dec 2013 10:11:22 +0000 (+0100)
Subject: Do not enable Includes on all static vhosts
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6df4e60243ec39e3afadc00d88c6e9d34f9ae88f;p=mirror%2Fdsa-puppet.git

Do not enable Includes on all static vhosts
---

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 2e79bcbdd..ab2bb4f8d 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -9,7 +9,6 @@
 	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 Includes
 		IndexOptions FancyIndexing NameWidth=*
 		Order allow,deny
 		Allow from all
@@ -17,7 +16,6 @@
 
 	DefaultType text/plain
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
-	AddOutputFilter INCLUDES .xhtml
 </Macro>