diff options
author | Micah Anderson <micah@riseup.net> | 2011-03-25 00:25:28 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2011-03-25 00:25:28 -0400 |
commit | 4b0487fbea9e4fb828e618182215df0318b7ed1e (patch) | |
tree | ebc06f3da869c9ffa83b5ea929e6ddfa82245c14 /manifests/plugins/selinux.pp | |
parent | d4ca996f8e6d28d7c8f8ad2c922d6205c6b94dcb (diff) | |
parent | 17df63f17e1aab4c15584b41fbe7fe925503e054 (diff) |
Merge remote-tracking branch 'immerda/master'
Conflicts:
manifests/host.pp
manifests/host/cgi.pp
manifests/plugin.pp
manifests/plugin/deploy.pp
manifests/plugins/apache.pp
manifests/plugins/base.pp
manifests/plugins/dom0.pp
manifests/plugins/gentoo.pp
manifests/plugins/interfaces.pp
manifests/plugins/linux.pp
manifests/plugins/openbsd.pp
manifests/plugins/physical.pp
manifests/plugins/selinux.pp
manifests/plugins/vserver.pp
Diffstat (limited to 'manifests/plugins/selinux.pp')
-rw-r--r-- | manifests/plugins/selinux.pp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/manifests/plugins/selinux.pp b/manifests/plugins/selinux.pp index 847f0b9..faf610a 100644 --- a/manifests/plugins/selinux.pp +++ b/manifests/plugins/selinux.pp @@ -1,6 +1,3 @@ -class munin::plugins::selinux inherits munin::plugins::base { - - munin::plugin::deploy { "selinuxenforced": } - munin::plugin::deploy { "selinux_avcstats": } - +class munin::plugins::selinux { + munin::plugin::deploy { [ 'selinuxenforced', 'selinux_avcstats' ]: } } |