From: Julien Cristau <jcristau@debian.org>
Date: Sat, 2 Jan 2016 22:28:21 +0000 (+0100)
Subject: Revert "static-mirroring: add common-static-vhost-ssl-with-extra macro"
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a246c719342267cb573840f29fb9f647f2b7f857;p=mirror%2Fdsa-puppet.git

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 6c7ad11d8..6b857fc60 100644
--- 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: