X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a73476b53d7bfbab341d51fd88ff513ef4c24ce..605d99f67ad361a244d3ea699181aa14aca5d9ec:/cookbooks/sysctl/recipes/default.rb

diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index adf43e55c..ae22a7b3b 100644
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# 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.
@@ -17,36 +17,35 @@
 # limitations under the License.
 #
 
-package "procps"
-
-directory "/etc/sysctl.d" do
-  owner "root"
-  group "root"
-  mode 0o755
+file "/etc/sysctl.d/60-chef.conf" do
+  action :delete
 end
 
-execute "sysctl" do
-  action :nothing
-  command "/sbin/sysctl -p /etc/sysctl.d/60-chef.conf"
-end
+if node[:virtualization][:role] != "guest" ||
+   (node[:virtualization][:system] != "lxc" &&
+    node[:virtualization][:system] != "lxd")
+  keys = []
 
-template "/etc/sysctl.d/60-chef.conf" do
-  source "chef.conf.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-  notifies :run, "execute[sysctl]"
-end
+  Dir.new("/etc/sysctl.d").each_entry do |file|
+    next unless file =~ /^99-chef-(.*)\.conf$/
+
+    keys.push(Regexp.last_match(1))
+  end
+
+  node[:sysctl].each_value do |group|
+    group[:parameters].each do |key, value|
+      sysctl key do
+        value value
+        # comment group[:comment]
+      end
 
-node[:sysctl].each_value do |group|
-  group[:parameters].each do |key, value|
-    sysctl_file = "/proc/sys/#{key.tr('.', '/')}"
+      keys.delete(key)
+    end
+  end
 
-    file sysctl_file do
-      content "#{value}\n"
-      atomic_update false
-      ignore_failure true
-      only_if { File.exist?(sysctl_file) }
+  keys.each do |key|
+    sysctl key do
+      action :remove
     end
   end
 end