From bf16c9dd36884ae478a783b14bc51b2fe26fcb08 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 22 Jul 2014 21:41:41 +0200
Subject: [PATCH] Make a common-dsa-vhost-https-redirect macro

---
 .../static-mirroring/static-vhost.conf.erb    | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 5e3fe41db..58cfb1d88 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -1,4 +1,15 @@
 # puppet maintained
+<Macro common-dsa-vhost-https-redirect $name>
+	<VirtualHost <%= vhost_listen %> >
+		ServerName $name
+		ServerAdmin debian-admin@lists.debian.org
+
+		CustomLog /var/log/apache2/$name-access.log privacy
+		ErrorLog /var/log/apache2/$name-error.log
+
+		Redirect permanent / https://$name/
+	</VirtualHost>
+</Macro>
 
 <Macro common-static-base $name>
 	<IfModule mod_userdir.c>
@@ -38,15 +49,7 @@
 
 
 <Macro common-static-vhost-ssl $name>
-	<VirtualHost <%= vhost_listen %> >
-		ServerName $name
-		ServerAdmin debian-admin@lists.debian.org
-
-		CustomLog /var/log/apache2/$name-access.log privacy
-		ErrorLog /var/log/apache2/$name-error.log
-
-		Redirect permanent / https://$name/
-	</VirtualHost>
+	Use common-dsa-vhost-https-redirect $name
 
 	<Virtualhost <%= vhost_listen_443 %> >
 		ServerName $name
-- 
2.20.1