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

Try this instead
---

diff --git a/modules/roles/files/static-mirroring/vhost/planet.debian.org b/modules/roles/files/static-mirroring/vhost/planet.debian.org
index 22bf348b5..8bda41fb1 100644
--- a/modules/roles/files/static-mirroring/vhost/planet.debian.org
+++ b/modules/roles/files/static-mirroring/vhost/planet.debian.org
@@ -1,4 +1,4 @@
-Use DebianStaticMirrorVhostLine
+Include /etc/apache2/inc/static-mirror-vhost
 	ServerName planet.debian.org
 	ServerAlias planet.debian.net planeta.debian.net
 	ServerAdmin planet@debian.org
diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 390e56338..8ba0fe91c 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -25,10 +25,12 @@ class roles::static_mirror inherits roles::static_source {
             content => "PATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; static-mirror-run --one-stage /srv/static.debian.org bizet.debian.org:-live- > /dev/null\n",
             ;
 
-    }
-
-    apache2::config { 'static-mirror-macros':
-        content => template('roles/static-mirroring/apache-conf-static-mirror-macros.erb'),
+        '/etc/apache2/inc':
+            ensure => directory,
+            ;
+        '/etc/apache2/inc/static-mirror-vhost':
+            content => template('roles/static-mirroring/apache-inc-static-mirror-vhost.erb'),
+            ;
     }
 
     apache2::site { '010-planet.debian.org':
diff --git a/modules/roles/templates/static-mirroring/apache-conf-static-mirror-macros.erb b/modules/roles/templates/static-mirroring/apache-conf-static-mirror-macros.erb
deleted file mode 100644
index 20d2d971a..000000000
--- a/modules/roles/templates/static-mirroring/apache-conf-static-mirror-macros.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-##
-## 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>
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
new file mode 100644
index 000000000..20d2d971a
--- /dev/null
+++ b/modules/roles/templates/static-mirroring/apache-inc-static-mirror-vhost.erb
@@ -0,0 +1,11 @@
+##
+## 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>