From dab730ed6b0667d4356c0e8e21e37719ea977a93 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 15 Jul 2010 20:41:39 +0200 Subject: fixing weird class setup we had some weird class setup which caused some problems on 2.6 (see puppet bug #4242 for more info). This commit cleans that weird setup up and decouples a lot of things. --- manifests/plugins/linux.pp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'manifests/plugins/linux.pp') diff --git a/manifests/plugins/linux.pp b/manifests/plugins/linux.pp index 86696cc..30e0af6 100644 --- a/manifests/plugins/linux.pp +++ b/manifests/plugins/linux.pp @@ -1,10 +1,8 @@ -class munin::plugins::linux inherits munin::plugins::base { - munin::plugin { - [ df_abs, forks, df_inode, irqstats, entropy, open_inodes ]: - ensure => present; - acpi: - ensure => $acpi_available; - } - - include munin::plugins::interfaces +class munin::plugins::linux { + munin::plugin { + [ df_abs, forks, df_inode, irqstats, entropy, open_inodes ]: + ensure => present; + acpi: + ensure => $acpi_available; + } } -- cgit v1.2.3