From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 29 Jul 2016 18:12:04 +0000 (+0000)
Subject: Make common-static-vhost-ssl-with-extra a thing
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=61243d82a12d7a78a1a9cb1959e46e7bc96c745f;p=mirror%2Fdsa-puppet.git

Make common-static-vhost-ssl-with-extra a thing
---

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index c2d225289..cb6cf2225 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -69,7 +69,7 @@
 </Macro>
 
 
-<Macro common-static-vhost-ssl $name $onion>
+<Macro common-static-vhost-ssl-with-extra $name $onion>
 	Use common-dsa-vhost-https-redirect $name
 
 	<Virtualhost <%= vhost_listen_443 %> >
@@ -83,6 +83,7 @@
 		Use common-ssl-HSTS
 
 		Use common-static-base $name
+		Use vhost-$name-extra
 	</VirtualHost>
 
 	<Virtualhost <%= vhost_listen %> >
@@ -93,7 +94,17 @@
 		CustomLog /var/log/apache2/$name-access.log privacyssl
 
 		Use common-static-base $name
+		Use vhost-$name-extra
 	</VirtualHost>
 </Macro>
 
+<Macro common-static-vhost-ssl $name $onion>
+	<Macro vhost-$name-extra>
+		# mod macro does not like empty macros, so here's some content:
+		<Directory /non-existant>
+		</Directory>
+	</Macro>
+	Use common-static-vhost-ssl-with-extra $name $onion
+</Macro>
+
 # vim:ft=apache: