fixed some left stuff

1 files changed, 10 insertions, 5 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 830a692..03d0ba5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -81,26 +81,31 @@ class puppetmaster inherits puppet {
     $real_puppetmaster_conf_source = $puppet_conf_source ? {
         '' => [ "puppet://$server/dist/puppet/master/puppet.conf",
                 "puppet://$server/puppet/master/puppet.conf" ],
-        default => "puppet://$server/$source",
+        default => "puppet://$server/$puppet_conf_source",
     }
-
     $real_puppet_fileserver_source = $puppet_fileserver_source ? {
         '' => [ "puppet://$server/dist/puppet/master/fileserver.conf",
                 "puppet://$server/puppet/master/fileserver.conf" ],
         default => "puppet://$server/$puppet_fileserver_source"
     }
 
+
     File[puppet_config]{
         source => $real_puppetmaster_conf_source,
         notify => [Service[puppet],Service[puppetmaster] ],
     }
 
-    file { 'fileserver_config':
-        path => '/etc/puppet/fileserver.conf',
+    $real_puppet_fileserver_source = $puppet_fileserver_source ? {
+        '' => [ "puppet://$server/dist/puppet/master/fileserver.conf",
+                "puppet://$server/puppet/master/fileserver.conf" ],
+        default => "puppet://$server/$puppet_fileserver_source"
+    }
+
+    file { '/etc/puppet/fileserver.conf':
         owner => root,
         group => 0,
         mode => 600,
-        source => $real_puppet_fileserver_source,
+        source => $real_puppet_fileserver_source ,
         notify => [Service[puppet],Service[puppetmaster] ],
     }
 }