From d0023f476fba2facd946b996719ce3e97e03ba79 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 8 Dec 2012 18:05:45 +0100
Subject: [PATCH] mirrors do not need the components list

---
 modules/roles/manifests/static_base.pp   | 6 ------
 modules/roles/manifests/static_master.pp | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/roles/manifests/static_base.pp b/modules/roles/manifests/static_base.pp
index 267c8ba61..2de3b9b6e 100644
--- a/modules/roles/manifests/static_base.pp
+++ b/modules/roles/manifests/static_base.pp
@@ -5,12 +5,6 @@ class roles::static_base {
             onlyif  => '/usr/bin/getent passwd staticsync > /dev/null && ! [ -e /home/staticsync/.ssh/id_rsa ]'
         }
     }
-
-    file {
-        '/etc/static-components.conf':
-            source  => "puppet:///modules/roles/static-mirroring/static-components.conf",
-            ;
-    }
 }
 # vim:set et:
 # vim:set sts=4 ts=4:
diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp
index cd5b061b2..bb722be7d 100644
--- a/modules/roles/manifests/static_master.pp
+++ b/modules/roles/manifests/static_master.pp
@@ -15,6 +15,10 @@ class roles::static_master inherits roles::static_base {
             source  => "puppet:///modules/roles/static-mirroring/static-master-update-component",
             mode => 555,
             ;
+
+        '/etc/static-components.conf':
+            source  => "puppet:///modules/roles/static-mirroring/static-components.conf",
+            ;
     }
 }
 # vim:set et:
-- 
2.20.1