summaryrefslogtreecommitdiff
path: root/manifests/puppetmaster/base.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/puppetmaster/base.pp')
-rw-r--r--manifests/puppetmaster/base.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp
index c4ebe1f..0b208b0 100644
--- a/manifests/puppetmaster/base.pp
+++ b/manifests/puppetmaster/base.pp
@@ -1,7 +1,7 @@
class puppet::puppetmaster::base inherits puppet::base {
File[puppet_config]{
- source => [ "puppet://$server/files/puppet/master/puppet.conf",
+ source => [ "puppet://$server/modules/site-puppet/master/puppet.conf",
"puppet://$server/modules/puppet/master/puppet.conf" ],
notify => [Service[puppet],Service[puppetmaster] ],
}
@@ -12,8 +12,8 @@ class puppet::puppetmaster::base inherits puppet::base {
}
file { "$real_puppet_fileserverconfig":
- source => [ "puppet://$server/files/puppet/master/${fqdn}/fileserver.conf",
- "puppet://$server/files/puppet/master/fileserver.conf",
+ source => [ "puppet://$server/modules/site-puppet/master/${fqdn}/fileserver.conf",
+ "puppet://$server/modules/site-puppet/master/fileserver.conf",
"puppet://$server/modules/puppet/master/fileserver.conf" ],
notify => [Service[puppet],Service[puppetmaster] ],
owner => root, group => puppet, mode => 640;