diff options
author | Micah Anderson <micah@riseup.net> | 2011-03-25 00:01:54 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2011-03-25 00:01:54 -0400 |
commit | 5218993abef2a8bf79278d4d84123843279735c5 (patch) | |
tree | 8fe859ba86b83e4b9782ac19a37c89bf5cf5f0ba /manifests/client/package.pp | |
parent | b3e29447187e289c60a4a9f7830032f1b10fae2f (diff) | |
parent | e7d23dabf191c5416197af0b229fc90b94539405 (diff) |
Merge commit 'e7d23dabf191c5416197af0b229fc90b94539405'
Conflicts:
manifests/client.pp
manifests/client/base.pp
manifests/client/darwin.pp
manifests/client/debian.pp
manifests/client/gentoo.pp
manifests/client/openbsd.pp
manifests/client/package.pp
manifests/host.pp
manifests/init.pp
manifests/plugin.pp
manifests/plugin/scriptpaths.pp
manifests/plugins/interfaces.pp
manifests/plugins/linux.pp
manifests/plugins/vserver.pp
manifests/register.pp
manifests/register_snmp.pp
manifests/remoteplugin.pp
manifests/snmp_collector.pp
Diffstat (limited to 'manifests/client/package.pp')
-rw-r--r-- | manifests/client/package.pp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/manifests/client/package.pp b/manifests/client/package.pp index f6e7a08..0ee7443 100644 --- a/manifests/client/package.pp +++ b/manifests/client/package.pp @@ -8,22 +8,14 @@ class munin::client::package inherits munin::client::base { ensure => $munin_node_ensure_version; } - Package['munin-node']{ - require => Package['munin-common'], + 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 => $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'], - } - } |