From bc853371f8d890a376e522b55111537c0c5ff8b2 Mon Sep 17 00:00:00 2001 From: Keith aka fugit Date: Fri, 22 Apr 2011 10:44:48 -0400 Subject: added fqdn path call for source puppet.conf --- manifests/puppetmaster/base.pp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index 6ac1e0c..b1fca5a 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -1,8 +1,11 @@ class puppet::puppetmaster::base inherits puppet::base { File[puppet_config]{ - source => [ "puppet:///modules/site-puppet/master/puppet.conf", - "puppet:///modules/puppet/master/puppet.conf" ], + source => [ + "puppet:///modules/site-puppet/master/${fqdn}/puppet.conf", + "puppet:///modules/site-puppet/master/puppet.conf", + "puppet:///modules/puppet/master/puppet.conf", + ], } if !$puppet_fileserverconfig { $puppet_fileserverconfig = '/etc/puppet/fileserver.conf' } -- cgit v1.2.3