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=f4a8a766c3bd060ea9b2c8c8c75ae052b89df4b9;hp=6b60121c9241d8a2798ce2ade011c7b1da186be9;hpb=ddc1f106c9ef6bff0d34a743d110189684c391cf;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 6b60121c9..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,6 @@
# puppet maintained
- >
+ >
ServerName $name
ServerAdmin debian-admin@lists.debian.org
@@ -11,19 +11,10 @@
-
- >
- ServerName $name
- ServerAdmin debian-admin@lists.debian.org
-
- CustomLog /var/log/apache2/$name-access.log privacy
- ErrorLog /var/log/apache2/$name-error.log
+
+
+ ServerAdmin debian-admin@lists.debian.org
- Redirect / https://$name/
-
-
-
-
UserDir disabled
@@ -32,56 +23,53 @@
DocumentRoot /srv/static.debian.org/mirrors/$name/cur
AllowOverride FileInfo Indexes Options=Multiviews
- Options Indexes
- IndexOptions FancyIndexing NameWidth=*
- <% if @lsbmajdistrelease > '7' -%>
- Require all granted
- <% else -%>
- Order allow,deny
- Allow from all
- <% end -%>
+ Options Indexes SymLinksIfOwnerMatch
+ Require all granted
- Header set Surrogate-Key <%= hostname %>
+ Header set Surrogate-Key <%= @hostname %>
- DefaultType text/plain
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
-
- Use common-static-vhost-with-extra $name "# nada"
-
+
+ >
+ ServerName $onion
+ ErrorLog /var/log/apache2/$name-error.log
+ CustomLog /var/log/apache2/$name-access.log privacy
-
- Use common-dsa-vhost-https-redirect $name
+ Use static-vhost-base-$name
+
+
- >
+
+ >
ServerName $name
- ServerAdmin debian-admin@lists.debian.org
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 common-static-base $name
+ Use static-vhost-base-$name
+
# vim:ft=apache: