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 c2d2252..cb6cf22 100644 (file)
--- 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: