Revert "static-mirroring: add common-static-vhost-ssl-with-extra macro"

This reverts commit 8f4f534e4d36f406477077c09d113982014e49e9.

That's not going to work out.

Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 6c7ad11..6b857fc 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -66,7 +66,7 @@
 </Macro>
 
 
-<Macro common-static-vhost-ssl-with-extra $name $extra>
+<Macro common-static-vhost-ssl $name>
        Use common-dsa-vhost-https-redirect $name
 
        <Virtualhost <%= vhost_listen_443 %> >
@@ -80,12 +80,7 @@
                Use common-ssl-HSTS
 
                Use common-static-base $name
-               $extra
        </VirtualHost>
 </Macro>
 
-<Macro common-static-vhost-ssl $name>
-       Use common-static-vhost-ssl-with-extra $name "# nada"
-</Macro>
-
 # vim:ft=apache: