X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..87a5f38102d7c70052e404469f79cfea608c1363:/cookbooks/sysctl/recipes/default.rb

diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index 58e86f94c..d2797a289 100644
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -21,31 +21,23 @@ package "procps" do
   action :install
 end
 
-if node[:lsb][:release].to_f <= 8.04
-  sysctl_template = "sysctl.conf.erb"
-  sysctl_conf = "/etc/sysctl.conf"
-else
-  directory "/etc/sysctl.d" do
-    owner "root"
-    group "root"
-    mode 0755
-  end
-
-  sysctl_template = "chef.conf.erb"
-  sysctl_conf = "/etc/sysctl.d/60-chef.conf"
+directory "/etc/sysctl.d" do
+  owner "root"
+  group "root"
+  mode 0755
 end
 
 execute "sysctl" do
   action :nothing
-  command "/sbin/sysctl -p #{sysctl_conf}"
+  command "/sbin/sysctl -p /etc/sysctl.d/60-chef.conf"
 end
 
-template sysctl_conf do
-  source sysctl_template
+template "/etc/sysctl.d/60-chef.conf" do
+  source "chef.conf.erb"
   owner "root"
   group "root"
   mode 0644
-  notifies :run, resources(:execute => "sysctl")
+  notifies :run, "execute[sysctl]"
 end
 
 node[:sysctl].each_value do |group|
@@ -54,6 +46,7 @@ node[:sysctl].each_value do |group|
 
     file sysctl_file do
       content "#{value}\n"
+      atomic_update false
       only_if { File.exists?(sysctl_file) }
     end
   end