summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2012-06-10 16:56:31 -0300
committermh <mh@immerda.ch>2012-06-10 16:56:31 -0300
commit094a8faa46f842bc99adbdc207aace375517afba (patch)
tree998cc440ed37ad068d85852deac09481a70489bb
parenta83290235e9da22d05de814b22e265f53a0dc6bb (diff)
use another source for the master
-rw-r--r--manifests/master/base.pp6
1 files changed, 6 insertions, 0 deletions
diff --git a/manifests/master/base.pp b/manifests/master/base.pp
index 6e8efe4..390d9b5 100644
--- a/manifests/master/base.pp
+++ b/manifests/master/base.pp
@@ -7,6 +7,12 @@ class puppet::master::base inherits puppet::base {
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::storeconfigs {
include puppet::master::storeconfigs
}