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=cb6cf2225801f9f624d1a55619632cdf8eebdcc4;hpb=61243d82a12d7a78a1a9cb1959e46e7bc96c745f;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 cb6cf2225..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
-
- Redirect / https://$name/
-
-
+
+
+ ServerAdmin debian-admin@lists.debian.org
-
UserDir disabled
@@ -33,78 +24,52 @@
AllowOverride FileInfo Indexes Options=Multiviews
Options Indexes SymLinksIfOwnerMatch
- IndexOptions FancyIndexing NameWidth=*
Require all granted
- Header set Surrogate-Key <%= hostname %>
+ Header set Surrogate-Key <%= @hostname %>
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
-
-
-
+ Use vstatic-vhost-extra-$name
+
-
- >
+
+ >
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
- Use vhost-$name-extra
+ Use static-vhost-base-$name
-
-
- # mod macro does not like empty macros, so here's some content:
-
-
-
- Use common-static-vhost-with-extra $name $onion
-
+
+ >
+ 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 vhost-$name-extra
-
-
- >
- 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
- Use vhost-$name-extra
+ Use static-vhost-base-$name
-
-
-
- # mod macro does not like empty macros, so here's some content:
-
-
-
- Use common-static-vhost-ssl-with-extra $name $onion
# vim:ft=apache: