X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=c2d22528998231c40ac9268e42f948e82bc318e8;hb=1914af73e5e8f62c3058ac19135802a7777acbb6;hp=b2650744f6c2bb5f8aa65fb3124f4c3ff07910ae;hpb=4e800c40376ed16d58a5de2575a3d009ce284e35;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 b2650744f..c2d225289 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -32,37 +32,44 @@
DocumentRoot /srv/static.debian.org/mirrors/$name/cur
AllowOverride FileInfo Indexes Options=Multiviews
+ Options Indexes SymLinksIfOwnerMatch
IndexOptions FancyIndexing NameWidth=*
- Order allow,deny
- Allow from all
+ Require all granted
Header set Surrogate-Key <%= hostname %>
- DefaultType text/plain
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
-
+
+
+
>
ServerName $name
+ ServerAlias $onion
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
+ Use vhost-$name-extra
-
- Use common-static-vhost-with-extra $name "# nada"
+
+
+ # mod macro does not like empty macros, so here's some content:
+
+
+
+ Use common-static-vhost-with-extra $name $onion
-
+
Use common-dsa-vhost-https-redirect $name
>
@@ -77,6 +84,16 @@
Use common-static-base $name
+
+ >
+ ServerName $onion
+ ServerAdmin debian-admin@lists.debian.org
+
+ ErrorLog /var/log/apache2/$name-error.log
+ CustomLog /var/log/apache2/$name-access.log privacyssl
+
+ Use common-static-base $name
+
# vim:ft=apache: