X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=2e79bcbdd96deea22fa5d76654bd282d44a79ab2;hb=898ea78774b44c2023e8ea91869b3af23a82c416;hp=4b8640cee89bfab416d4796191c27e00db9c0a36;hpb=4433aee9a7832e8e64c93de3b9f5370519ebc221;p=dsa-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 4b8640ce..2e79bcbd 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -6,20 +6,22 @@
ServerSignature On
- DocumentRoot /srv/static.debian.org/cur/$name/
-
- AllowOverride FileInfo
- Options Multiviews Indexes FollowSymLinks
+ DocumentRoot /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
+ DefaultType text/plain
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+ AddOutputFilter INCLUDES .xhtml
-
+
>
ServerName $name
ServerAdmin debian-admin@lists.debian.org
@@ -28,6 +30,7 @@
CustomLog /var/log/apache2/$name-access.log privacy
Use common-static-base $name
+ $extra
@@ -46,5 +49,9 @@
+
+ Use common-static-vhost-with-extra $name "# nada"
+
+
# vim:ft=apache: