rearranged config stuff

1 files changed, 46 insertions, 31 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 959fa61..a10fd40 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -9,6 +9,24 @@ class puppet {
         linux: { include puppet::linux}
         openbsd: { include puppet::openbsd}
     }
+
+    $real_puppet_conf_source = $puppet_conf_source ? {
+        '' => [ "puppet://$server/dist/puppet/client/puppet.conf.$operatingsystem",
+                "puppet://$server/dist/puppet/client/puppet.conf", 
+                "puppet://$server/puppet/client/puppet.conf.$operatingsystem",
+                "puppet://$server/puppet/client/puppet.conf" ],
+        default => "puppet://$server/$source",
+    }
+
+    file { 'pupet_config':
+        path => '/etc/puppet/puppet.conf',
+        owner => root,
+        group => 0,
+        mode => 600,
+        source => $real_puppet_conf_source,
+        notify => Service[puppet],
+    }
+
 }
 
 class puppet::linux {
@@ -59,40 +77,22 @@ class puppetmaster inherits puppet {
         ensure => running,
         require => Package[puppet],
     }
-}
-
-define puppet::config($source = ''){
 
-    $real_source = $source ? {
-        '' => [ "puppet://$server/puppet/client/puppet.conf.$operatingsystem",
-                "puppet://$server/puppet/client/puppet.conf" ],
+    $real_puppetmaster_conf_source = $puppet_conf_source ? {
+        '' => [ "puppet://$server/dist/puppet/master/puppet.conf",
+                "puppet://$server/puppet/master/puppet.conf" ],
         default => "puppet://$server/$source",
     }
 
-    file { 'pupet_config':
-        path => '/etc/puppet/puppet.conf',
-        owner => root,
-        group => 0,
-        mode => 600,
-        source => $real_source,
-        notify => Service[puppet],
-    }
-}
-
-define puppet::masterconfig(
-    $puppetsource = '',
-    $fileserversource = ''
-){
-
-
-    $real_puppetsource = $puppetsource ? {
-        '' => 'puppet/master/puppet.conf',
-        default => $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"
     }
 
-    $real_fileserversource = $fileserversource ? {
-        '' => 'puppet/master/fileserver.conf',
-        default => $source,
+    File[pupet_config]{
+        source => $real_puppetmaster_conf_source,
+        notify => [Service[puppet],Service[puppetmaster] ],
     }
 
     file { 'pupet_config':
@@ -100,17 +100,32 @@ define puppet::masterconfig(
         owner => root,
         group => 0,
         mode => 600,
-        source => "puppet://$server/$real_puppetsource",
-        notify => [Service[puppet],Service[puppetmaster] ],
+        source => $real_puppetsource,
     }
     file { 'fileserver_config':
         path => '/etc/puppet/fileserver.conf',
         owner => root,
         group => 0,
         mode => 600,
-        source => "puppet://$server/$real_fileserversource",
+        source => $real_puppet_fileserver_source,
         notify => [Service[puppet],Service[puppetmaster] ],
     }
 }
 
+define puppet::config($source = ''){
+
+    $real_source = $source ? {
+        '' => [ "puppet://$server/puppet/client/puppet.conf.$operatingsystem",
+                "puppet://$server/puppet/client/puppet.conf" ],
+        default => "puppet://$server/$source",
+    }
 
+    file { 'pupet_config':
+        path => '/etc/puppet/puppet.conf',
+        owner => root,
+        group => 0,
+        mode => 600,
+        source => $real_source,
+        notify => Service[puppet],
+    }
+}