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 562504835fceaa7c11154c01fe2170ce0ce15d3f..bf9860e0cf50bf7d08baec79736cf167af2e14b3 100644 (file)
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: sysctl
+# Cookbook:: sysctl
 # Recipe:: default
 #
-# Copyright 2010, Tom Hughes
+# Copyright:: 2010, Tom Hughes
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,37 +17,26 @@
 # limitations under the License.
 #
 
-package "procps" do
-  action :install
+file "/etc/sysctl.d/60-chef.conf" do
+  action :delete
 end
 
-directory "/etc/sysctl.d" do
-  owner "root"
-  group "root"
-  mode 0755
-end
-
-execute "sysctl" do
-  action :nothing
-  command "/sbin/sysctl -p /etc/sysctl.d/60-chef.conf"
-end
-
-template "/etc/sysctl.d/60-chef.conf" do
-  source "chef.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
-  notifies :run, "execute[sysctl]"
-end
+if node[:virtualization][:role] != "guest" ||
+   node[:virtualization][:system] != "lxd"
+  node[:sysctl].each_value do |group|
+    group[:parameters].each do |key, value|
+      sysctl key do
+        value value
+        # comment group[:comment]
+      end
+    end
+  end
 
-node[:sysctl].each_value do |group|
-  group[:parameters].each do |key, value|
-    sysctl_file = "/proc/sys/#{key.tr('.', '/')}"
+  Dir.new("/etc/sysctl.d").each_entry do |file|
+    next unless file =~ /^99-chef-(.*)\.conf$/
 
-    file sysctl_file do
-      content "#{value}\n"
-      atomic_update false
-      only_if { File.exist?(sysctl_file) }
+    sysctl Regexp.last_match(1) do
+      action :remove
     end
   end
 end