From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 8 Dec 2012 17:05:45 +0000 (+0100)
Subject: mirrors do not need the components list
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d0023f476fba2facd946b996719ce3e97e03ba79;p=dsa-puppet.git

mirrors do not need the components list
---

diff --git a/modules/roles/manifests/static_base.pp b/modules/roles/manifests/static_base.pp
index 267c8ba6..2de3b9b6 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 cd5b061b..bb722be7 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: