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=ea0d2acb1b2a817e745c9e6b9b6c9505201b2d60;hpb=927f9ca9bed8928ea91ba1a599857c483ae4994e;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 ea0d2acb1..ab2bb4f8d 100644 --- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb +++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb @@ -1,35 +1,55 @@ # puppet maintained - - + UserDir disabled 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 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 + + > + ServerName $name + ServerAdmin debian-admin@lists.debian.org + + ErrorLog /var/log/apache2/$name-error.log + CustomLog /var/log/apache2/$name-access.log privacy + + Use common-static-base $name + $extra + + + + + > + ServerName $name + ServerAdmin debian-admin@lists.debian.org - ErrorLog /var/log/apache2/$name-error.log - CustomLog /var/log/apache2/$name-access.log combined + ErrorLog /var/log/apache2/$name-error.log + CustomLog /var/log/apache2/$name-access.log privacy + + CustomLog /var/log/apache2/$name-public-access.log privacy+geo + - Use common-$name - + Use common-static-base $name + + + + Use common-static-vhost-with-extra $name "# nada" + # vim:ft=apache: