From 85d5f347a5fda6ba552e40090869bdb7b8b56fef Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 8 Dec 2012 18:42:36 +0100 Subject: [PATCH] Everybody gets static-components.conf, even though only the master and sources need it --- modules/roles/manifests/static_base.pp | 6 ++++++ modules/roles/manifests/static_master.pp | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/roles/manifests/static_base.pp b/modules/roles/manifests/static_base.pp index 2de3b9b6e..267c8ba61 100644 --- a/modules/roles/manifests/static_base.pp +++ b/modules/roles/manifests/static_base.pp @@ -5,6 +5,12 @@ 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 4f982bd39..e1d61a141 100644 --- a/modules/roles/manifests/static_master.pp +++ b/modules/roles/manifests/static_master.pp @@ -16,9 +16,6 @@ class roles::static_master inherits roles::static_base { mode => 555, ; - '/etc/static-components.conf': - source => "puppet:///modules/roles/static-mirroring/static-components.conf", - ; '/etc/static-clients.conf': content => template('roles/static-clients.conf.erb'), ; -- 2.20.1