]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
mirrors do not need the components list
authorPeter Palfrader <peter@palfrader.org>
Sat, 8 Dec 2012 17:05:45 +0000 (18:05 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sat, 8 Dec 2012 17:05:45 +0000 (18:05 +0100)
modules/roles/manifests/static_base.pp
modules/roles/manifests/static_master.pp

index 267c8ba61f64e47550df972dad06642e369c066b..2de3b9b6e16b45cca35697e3c61a0d07050de846 100644 (file)
@@ -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:
index cd5b061b22fbddc3263fa9c23e63c12b6c90adfc..bb722be7d1602bca9224879a70f38d08b1f0b9bb 100644 (file)
@@ -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: