diff options
Diffstat (limited to 'manifests/debian.pp')
-rw-r--r-- | manifests/debian.pp | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index fba7beb..f0479ae 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -1,5 +1,6 @@ class puppet::debian inherits puppet::linux { - file{'/etc/default/puppet': + + file { '/etc/default/puppet': source => [ "puppet:///modules/site-puppet/client/debian/${fqdn}/puppet", "puppet:///modules/site-puppet/client/debian/${domain}/puppet", "puppet:///modules/site-puppet/client/debian/puppet", @@ -8,11 +9,27 @@ class puppet::debian inherits puppet::linux { owner => root, group => 0, mode => 0644; } - # there is really no status cmd for it + case $lsbdistcodename { + squeeze,sid: { + $real_puppet_hasstatus = true + } + default: { + $real_puppet_hasstatus = false + } + } + Service[puppet]{ - hasstatus => false, + hasstatus => $real_puppet_hasstatus, } - File['/etc/cron.d/puppetd.cron']{ - path => '/etc/cron.d/puppetd', + + if !$puppet_ensure_version { $puppet_ensure_version = 'installed' } + package{ 'puppet-common': + ensure => $puppet_ensure_version, } + + Package['puppet']{ + require => Package['puppet-common'] + } } + + |