diff options
| -rw-r--r-- | lib/facter/acpi_available.rb | 2 | ||||
| -rw-r--r-- | manifests/plugins/setup.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/facter/acpi_available.rb b/lib/facter/acpi_available.rb index 9a0474f..dae057f 100644 --- a/lib/facter/acpi_available.rb +++ b/lib/facter/acpi_available.rb @@ -1,7 +1,7 @@ # return whether acpi is available -- used for deciding whether to install the munin plugin Facter.add("acpi_available") do setcode do - if not File.exist? `which acpi 2>/dev/null`.chomp or `acpi -t -B -A 2>/dev/null`.match(/\d/).nil? + if not Facter::Util::Resolution.which('acpi') or `acpi -t -B -A 2>/dev/null`.match(/\d/).nil? "absent" else "present" diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp index e6210e9..e0826f0 100644 --- a/manifests/plugins/setup.pp +++ b/manifests/plugins/setup.pp @@ -2,7 +2,7 @@ class munin::plugins::setup { # This is required for the munin-node service and package requirements below. - include munin::client + Class['munin::client'] -> Class['munin::plugins::setup'] file { [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]: |