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=9a3e83c1925c72a8ac88fdcce9cee31c2fd7e94f;hb=a7d6a1e81e9e43b0b87698e9309ab3ec66c5bccc;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..9a3e83c19 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -1,35 +1,75 @@
# puppet maintained
+
+ >
+ ServerName $name
+ ServerAdmin debian-admin@lists.debian.org
+
+ CustomLog /var/log/apache2/$name-access.log privacy
+ ErrorLog /var/log/apache2/$name-error.log
+
+ Redirect permanent / https://$name/
+
+
+
+
+
+ ServerAdmin debian-admin@lists.debian.org
-
-
UserDir disabled
ServerSignature On
- DocumentRoot /srv/static.debian.org/cur/$name/
-
- AllowOverride FileInfo
- Options Multiviews Indexes FollowSymLinks
- IndexOptions FancyIndexing NameWidth=*
- Order allow,deny
- Allow from all
+ DocumentRoot /srv/static.debian.org/mirrors/$name/cur
+
+ AllowOverride FileInfo Indexes Options=Multiviews
+ Options Indexes SymLinksIfOwnerMatch
+ Require all granted
+ Header set Surrogate-Key <%= @hostname %>
+
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+
+ Use vstatic-vhost-extra-$name
- >
- ServerName $name
- ServerAdmin debian-admin@lists.debian.org
+
+ >
+ ServerName $name
+ ErrorLog /var/log/apache2/$name-error.log
+ CustomLog /var/log/apache2/$name-access.log privacy
- ErrorLog /var/log/apache2/$name-error.log
- CustomLog /var/log/apache2/$name-access.log combined
+ Use static-vhost-base-$name
+
+
+
+
+ >
+ ServerName $onion
+
+ ErrorLog /var/log/apache2/$name-error.log
+ CustomLog /var/log/apache2/$name-access.log privacy
+
+ Use static-vhost-base-$name
+
+
+
+
+ >
+ ServerName $name
- Use common-$name
-
+ ErrorLog /var/log/apache2/$name-error.log
+ CustomLog /var/log/apache2/$name-access.log privacyssl
+ Use common-debian-service-ssl $name
+ Use common-ssl-HSTS
+ Use http-pkp-$name
+
+ Use static-vhost-base-$name
+
+
# vim:ft=apache: