From e5e2211dc0baf540d62eaf1df8775d6b05193da1 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 5 Dec 2013 12:11:35 +0100 Subject: fix source if we pass config_content --- manifests/master/base.pp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/manifests/master/base.pp b/manifests/master/base.pp index 390d9b5..38658ca 100644 --- a/manifests/master/base.pp +++ b/manifests/master/base.pp @@ -1,16 +1,19 @@ +# overwrite a few things for the master class puppet::master::base inherits puppet::base { file { $puppet::master::fileserver: source => [ "puppet:///modules/site_puppet/master/${::fqdn}/fileserver.conf", - "puppet:///modules/site_puppet/master/fileserver.conf", - "puppet:///modules/puppet/master/fileserver.conf" ], + 'puppet:///modules/site_puppet/master/fileserver.conf', + 'puppet:///modules/puppet/master/fileserver.conf' ], owner => root, group => puppet, mode => 640; } - File['puppet_config']{ - source => [ "puppet:///modules/site_puppet/master/${::fqdn}/puppet.conf", - "puppet:///modules/site_puppet/master/puppet.conf", - "puppet:///modules/puppet/master/puppet.conf" ] + if !$puppet::master::config_content { + File['puppet_config']{ + source => [ "puppet:///modules/site_puppet/master/${::fqdn}/puppet.conf", + 'puppet:///modules/site_puppet/master/puppet.conf', + 'puppet:///modules/puppet/master/puppet.conf' ] + } } if $puppet::master::storeconfigs { -- cgit v1.2.3