summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp29
1 files changed, 2 insertions, 27 deletions
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],
- }
-}