diff options
| author | Micah Anderson <micah@riseup.net> | 2011-01-10 20:26:04 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-01-10 20:26:04 -0500 |
| commit | 455487921f507dbda10187e2dcec673c1a5587f5 (patch) | |
| tree | 4d53869056ba949dbf4beaf1dc2a7390b63e2992 | |
| parent | 7bc44c94a94e772542bb69476f306c3d1aef90ff (diff) | |
Fix up puppet/puppetmaster status method for Debian Squeeze and Sid, updating my previous commits with the fixes from LeLutin (closes: #2693)
| -rw-r--r-- | manifests/debian.pp | 20 | ||||
| -rw-r--r-- | manifests/puppetmaster/debian.pp | 6 |
2 files changed, 22 insertions, 4 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index 9f33c64..2927dd2 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -8,8 +8,22 @@ class puppet::debian inherits puppet::linux { notify => Service[puppet], owner => root, group => 0, mode => 0644; } - - File['/etc/cron.d/puppetd.cron']{ - path => '/etc/cron.d/puppetd', + + case $lsbdistcodename { + squeeze,sid: { + $real_puppet_hasstatus = true + } + default: { + $real_puppet_hasstatus = false + } + + Service[puppet]{ + hasstatus => $real_puppet_hasstatus, + } + + File['/etc/cron.d/puppetd.cron']{ + path => '/etc/cron.d/puppetd', + } } } + diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp index fcfae83..8cee0ea 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -1,7 +1,11 @@ class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { if $puppetmaster_mode != 'passenger' { - Service['puppetmaster'] { hasstatus => true, hasrestart => true } + case $lsbdistcodename { + squeeze,sid: { + Service['puppetmaster'] { hasstatus => true, hasrestart => true } + } + } } file { '/etc/default/puppetmaster': |