From: Tom Hughes <tom@compton.nu>
Date: Thu, 13 Feb 2020 19:54:09 +0000 (+0000)
Subject: Remove any sysctl settings which are no longer required
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/49d17eb0a36317f7a18650c557bb69f356c0a598

Remove any sysctl settings which are no longer required
---

diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index 8cc672eb8..bf9860e0c 100644
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -31,4 +31,12 @@ if node[:virtualization][:role] != "guest" ||
       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