From bf506a2fc6781b37d2137eb136594ca90b693d67 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 10 Apr 2008 22:19:59 +0000
Subject: fixed path issues

---
 manifests/init.pp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index 309033b..079b198 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,9 +17,14 @@ class puppet {
                 "puppet://$server/puppet/client/puppet.conf" ],
         default => "puppet://$server/$source",
     }
+    
+    $real_puppet_config = $puppet_config ? {
+        '' => "/etc/puppet/puppet.conf",
+        default => $puppet_config,
+    }
 
     file { 'puppet_config':
-        path => "$config",
+        path => "$real_puppet_config",
         owner => root,
         group => 0,
         mode => 600,
@@ -105,7 +110,12 @@ class puppetmaster::linux inherits puppet::linux {
         default => "puppet://$server/$puppet_fileserver_source"
     }
 
-    file { "$fileserverconfig":
+    $real_puppet_fileserverconfig = $puppet_fileserverconfig ? {
+        '' => "/etc/puppet/fileserver.conf",
+        default => $puppet_fileserverconfig,
+    }
+
+    file { "$real_puppet_fileserverconfig":
         owner => root,
         group => 0,
         mode => 600,
-- 
cgit v1.2.3