X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=5b2eb4db3d20f06fb7708568e1baee695cb46e87;hb=836eff39ec561176cd00cc2d7b4e66e9668a25ee;hp=e3aceae7bef443d895c06523cbaae92808417e06;hpb=d16ec737ef548a5ee85277ea8a95c3907ce99548;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 e3aceae7b..5b2eb4db3 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
@@ -9,48 +23,53 @@
DocumentRoot /srv/static.debian.org/mirrors/$name/cur
AllowOverride FileInfo Indexes Options=Multiviews
- Options Multiviews Indexes FollowSymLinks
- IndexOptions FancyIndexing NameWidth=*
- Order allow,deny
- Allow from all
+ Options Indexes SymLinksIfOwnerMatch
+ Require all granted
- DefaultType text/plain
+ 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
- $extra
+ 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
-
- Use common-static-vhost-with-extra $name "# nada"
-
+
+ >
+ 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: