summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith aka fugit <fugit13@gmail.com>2011-04-22 10:44:48 -0400
committerKeith aka fugit <fugit13@gmail.com>2011-04-22 10:44:48 -0400
commitbc853371f8d890a376e522b55111537c0c5ff8b2 (patch)
tree946748357d5543df1adbb9dd3f8596355c26381a
parentbc4fa29b454691b6c446b2881b4b3ea39d6b8272 (diff)
added fqdn path call for source puppet.conf
-rw-r--r--manifests/puppetmaster/base.pp7
1 files 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' }