Remove any sysctl settings which are no longer required

[chef.git] / cookbooks / sysctl / recipes / default.rb

diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index 0190b37b7d14230af1ea88e3b586b6d231c2d0e3..bf9860e0cf50bf7d08baec79736cf167af2e14b3 100644 (file)
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -27,8 +27,16 @@ if node[:virtualization][:role] != "guest" ||
     group[:parameters].each do |key, value|
       sysctl key do
         value value
-        comment group[:comment]
+        # comment group[:comment]
       end
     end
   end
+
+  Dir.new("/etc/sysctl.d").each_entry do |file|
+    next unless file =~ /^99-chef-(.*)\.conf$/
+
+    sysctl Regexp.last_match(1) do
+      action :remove
+    end
+  end
 end