diff options
author | Micah Anderson <micah@riseup.net> | 2013-04-17 16:36:37 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-04-17 16:36:37 -0400 |
commit | 8f7c0071eb82591477876eeb3f309067853a3261 (patch) | |
tree | b095f01b960b7ba3699da2dfa4d84cd5bb8a6361 /manifests/client/package.pp | |
parent | ea31faee76141646c173d88bd5bec5aa4a773c1c (diff) | |
parent | a5ce0a9317fc5dd5228cff4c5b6d36366c17b6d5 (diff) |
Merge branch 'master' into leap
Conflicts:
README
manifests/host/cgi.pp
Diffstat (limited to 'manifests/client/package.pp')
-rw-r--r-- | manifests/client/package.pp | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/manifests/client/package.pp b/manifests/client/package.pp index 29f256d..206ccc8 100644 --- a/manifests/client/package.pp +++ b/manifests/client/package.pp @@ -1,21 +1,12 @@ class munin::client::package inherits munin::client::base { - - if $munin_node_ensure_version == '' { $munin_node_ensure_version = 'installed' } - - if $operatingsystem == "Debian" and $lsbdistcodename != "lenny" { - package { 'munin-common': - before => Package['munin-node'], - ensure => $munin_node_ensure_version; - } - } - package { 'munin-node': ensure => $munin_node_ensure_version } - Service['munin-node']{ - require => Package[munin-node], - } - File['/etc/munin/munin-node.conf']{ - # this has to be installed before the package, so the postinst can - # boot the munin-node without failure! - before => Package['munin-node'], - } + package { 'munin-node': ensure => installed } + Service['munin-node']{ + require => Package[munin-node], + } + File['/etc/munin/munin-node.conf']{ + # this has to be installed before the package, so the postinst can + # boot the munin-node without failure! + before => Package['munin-node'], + } } |