From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 5 Aug 2016 17:10:53 +0000 (+0200)
Subject: retire unused macro common-dsa-vhost-https-redirect-temp
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=fcb420751dafbe3b3b86a4ea8e10a6dab6db8080;p=mirror%2Fdsa-puppet.git

retire unused macro common-dsa-vhost-https-redirect-temp
---

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index cb6cf2225..dda8c2a6c 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -11,18 +11,6 @@
 	</VirtualHost>
 </Macro>
 
-<Macro common-dsa-vhost-https-redirect-temp $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 / https://$name/
-	</VirtualHost>
-</Macro>
-
 <Macro common-static-base $name>
 	<IfModule mod_userdir.c>
 		UserDir disabled