From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 9 Dec 2012 11:59:41 +0000 (+0100)
Subject: Try this instead. II
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=34b69fd24ee62911aba7ccbb00cd5400ddc99a77;p=mirror%2Fdsa-puppet.git

Try this instead. II
---

diff --git a/modules/roles/templates/static-mirroring/apache-inc-static-mirror-vhost.erb b/modules/roles/templates/static-mirroring/apache-inc-static-mirror-vhost.erb
index 20d2d971a..5c35f719d 100644
--- a/modules/roles/templates/static-mirroring/apache-inc-static-mirror-vhost.erb
+++ b/modules/roles/templates/static-mirroring/apache-inc-static-mirror-vhost.erb
@@ -2,10 +2,8 @@
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 ##
 
-<Macro DebianStaticMirrorVhostLine>
 <% if hostname == "klecker" -%>
   <VirtualHost 130.89.148.14:80 2001:610:1908:b000::148:14:80>
 <% else -%>
   <VirtualHost *:80>
 <% end -%>
-</Macro>