diff options
| author | mh <mh@immerda.ch> | 2013-12-05 12:11:35 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2013-12-05 12:11:35 +0100 |
| commit | e5e2211dc0baf540d62eaf1df8775d6b05193da1 (patch) | |
| tree | baf867b1e211fcce91b9d10c160e4c175596e73e /manifests | |
| parent | 8db4cf07c117d62c92b6ff2c46948e7fc4b74c2e (diff) | |
fix source if we pass config_content
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/master/base.pp | 15 |
1 files 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 { |