From 094a8faa46f842bc99adbdc207aace375517afba Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 10 Jun 2012 16:56:31 -0300
Subject: use another source for the master

---
 manifests/master/base.pp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'manifests')

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
   }
-- 
cgit v1.2.3