diff options
Diffstat (limited to 'manifests/debian.pp')
| -rw-r--r-- | manifests/debian.pp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index f0479ae..e24a1bc 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -1,21 +1,19 @@ class puppet::debian inherits puppet::linux { 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", + source => [ "puppet:///modules/site_puppet/client/debian/${fqdn}/puppet", + "puppet:///modules/site_puppet/client/debian/${domain}/puppet", + "puppet:///modules/site_puppet/client/debian/puppet", "puppet:///modules/puppet/client/debian/puppet" ], notify => Service[puppet], owner => root, group => 0, mode => 0644; } - case $lsbdistcodename { - squeeze,sid: { - $real_puppet_hasstatus = true - } - default: { - $real_puppet_hasstatus = false - } + if versioncmp($puppetversion,'2.6') >= 0 { + $real_puppet_hasstatus = true + } + else { + $real_puppet_hasstatus = false } Service[puppet]{ |