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=cb2e9607cf2092ee657889e2eaee4224eadd7bfe;hp=6ab16d3c8bad6cc61f0ad8b32ef502f3d67ce84f;hpb=23b0492cd0c45eaefec93909a338b12bde7bed50;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 6ab16d3c8..9a3e83c19 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -1,6 +1,20 @@
# 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
@@ -8,43 +22,54 @@
DocumentRoot /srv/static.debian.org/mirrors/$name/cur
- AllowOverride FileInfo
- Options Multiviews Indexes FollowSymLinks
- IndexOptions FancyIndexing NameWidth=*
- Order allow,deny
- Allow from all
+ 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
ErrorLog /var/log/apache2/$name-error.log
CustomLog /var/log/apache2/$name-access.log privacy
- Use common-static-base $name
+ Use static-vhost-base-$name
-
- >
- ServerName $name
- ServerAdmin debian-admin@lists.debian.org
+
+ >
+ ServerName $onion
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-static-base $name
+ Use static-vhost-base-$name
+
+ >
+ ServerName $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: