X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=ab2bb4f8dfcc3005096ced7c76708dceb0553947;hb=d3cb659116b7c5d4ed4b24da4d1f95a2538db8fe;hp=6ab16d3c8bad6cc61f0ad8b32ef502f3d67ce84f;hpb=23b0492cd0c45eaefec93909a338b12bde7bed50;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 6ab16d3c8..ab2bb4f8d 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -8,18 +8,18 @@
 
 	DocumentRoot /srv/static.debian.org/mirrors/$name/cur
 	<Directory /srv/static.debian.org/mirrors/$name/cur>
-		AllowOverride FileInfo
-		Options Multiviews Indexes FollowSymLinks
+		AllowOverride FileInfo Indexes Options=Multiviews
 		IndexOptions FancyIndexing NameWidth=*
 		Order allow,deny
 		Allow from all
 	</Directory>
 
+	DefaultType text/plain
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 </Macro>
 
 
-<Macro common-static-vhost $name>
+<Macro common-static-vhost-with-extra $name $extra>
 	<Virtualhost <%= vhost_listen %> >
 		ServerName $name
 		ServerAdmin debian-admin@lists.debian.org
@@ -28,6 +28,7 @@
 		CustomLog /var/log/apache2/$name-access.log privacy
 
 		Use common-static-base $name
+		$extra
 	</VirtualHost>
 </Macro>
 
@@ -46,5 +47,9 @@
 	</VirtualHost>
 </Macro>
 
+<Macro common-static-vhost $name>
+	Use common-static-vhost-with-extra $name "# nada"
+</Macro>
+
 
 # vim:ft=apache: