From 22cd87e180ba785a0a9e2d78b33faf2fa2e1b2b6 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 29 Feb 2008 16:14:01 +0000
Subject: fixed some left stuff

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

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index a10fd40..a3bfb2f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -18,7 +18,7 @@ class puppet {
         default => "puppet://$server/$source",
     }
 
-    file { 'pupet_config':
+    file { 'puppet_config':
         path => '/etc/puppet/puppet.conf',
         owner => root,
         group => 0,
@@ -90,18 +90,11 @@ class puppetmaster inherits puppet {
         default => "puppet://$server/$puppet_fileserver_source"
     }
 
-    File[pupet_config]{
+    File[puppet_config]{
         source => $real_puppetmaster_conf_source,
         notify => [Service[puppet],Service[puppetmaster] ],
     }
 
-    file { 'pupet_config':
-        path => '/etc/puppet/puppet.conf',
-        owner => root,
-        group => 0,
-        mode => 600,
-        source => $real_puppetsource,
-    }
     file { 'fileserver_config':
         path => '/etc/puppet/fileserver.conf',
         owner => root,
@@ -111,21 +104,3 @@ class puppetmaster inherits puppet {
         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],
-    }
-}
-- 
cgit v1.2.3