diff options
| author | mh <mh@immerda.ch> | 2012-06-05 18:59:39 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-08 13:09:47 -0300 |
| commit | 09c8eaf304d1075980d8d9143545f2f16a1db34d (patch) | |
| tree | 57ab2c761e74eb95f873b72a109c2a620656469b /manifests/debian.pp | |
| parent | af97bf0e96167e916e36110eb858f257ccf083e6 (diff) | |
new style for 2.7
Diffstat (limited to 'manifests/debian.pp')
| -rw-r--r-- | manifests/debian.pp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index f0479ae..70f8161 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -1,35 +1,34 @@ 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 { + case $::lsbdistcodename { squeeze,sid: { - $real_puppet_hasstatus = true + $puppet_hasstatus = true } default: { - $real_puppet_hasstatus = false + $puppet_hasstatus = false } } - + Service[puppet]{ - hasstatus => $real_puppet_hasstatus, + hasstatus => $puppet_hasstatus, } - if !$puppet_ensure_version { $puppet_ensure_version = 'installed' } package{ 'puppet-common': - ensure => $puppet_ensure_version, + ensure => $puppet::ensure_version, } Package['puppet']{ require => Package['puppet-common'] - } + } } |