X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=e3aceae7bef443d895c06523cbaae92808417e06;hb=72d20becd8bde874f22d3ca31995aa1d1ccd01ba;hp=4b8640cee89bfab416d4796191c27e00db9c0a36;hpb=4433aee9a7832e8e64c93de3b9f5370519ebc221;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 4b8640cee..e3aceae7b 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -6,20 +6,21 @@
ServerSignature On
- DocumentRoot /srv/static.debian.org/cur/$name/
-
- AllowOverride FileInfo
+ DocumentRoot /srv/static.debian.org/mirrors/$name/cur
+
+ AllowOverride FileInfo Indexes Options=Multiviews
Options Multiviews Indexes FollowSymLinks
IndexOptions FancyIndexing NameWidth=*
Order allow,deny
Allow from all
+ DefaultType text/plain
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
-
+
>
ServerName $name
ServerAdmin debian-admin@lists.debian.org
@@ -28,6 +29,7 @@
CustomLog /var/log/apache2/$name-access.log privacy
Use common-static-base $name
+ $extra
@@ -46,5 +48,9 @@
+
+ Use common-static-vhost-with-extra $name "# nada"
+
+
# vim:ft=apache: