From: Tom Hughes <tom@compton.nu>
Date: Mon, 24 Jun 2013 09:36:41 +0000 (+0100)
Subject: Improve detection of nf_conntrack
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/35b4dcdb0ea68b7afa7634eafb3546ee28ce1813

Improve detection of nf_conntrack
---

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 8769352c4..eac718fc0 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -101,7 +101,7 @@ munin_plugin "diskstats"
 munin_plugin "entropy"
 munin_plugin "forks"
 
-if File.exists?("/proc/net/ip_conntrack") or File.exists?("/proc/net/nf_conntrack")
+if node[:kernel][:modules].include?("nf_conntrack")
   munin_plugin "fw_conntrack"
   munin_plugin "fw_forwarded_local"
 else