Merge branch 'dynamic-template-lwrps' of https://github.com/hw-cookbooks/sysctl into integration/hw-cookbook-dynamic-template

Conflicts:
	recipes/default.rb

Author: nukemberg

attributes/default.rb

@@ -0,0 +1,8 @@
+default[:sysctl][:conf_dir] = case node.platform_family
+  when 'debian'
+    '/etc/sysctl.d'
+  else
+    nil
+  end
+default[:sysctl][:attributes] = {}
+default[:sysctl][:allow_sysctl_conf] = false

libraries/sysctl.rb

@@ -0,0 +1,17 @@
+module Sysctl
+  class << self
+    def compile_attr(prefix, v)
+      case v
+      when Array
+        return "#{prefix}=#{v.join(" ")}"
+      when String, Fixnum, Bignum, Float, Symbol
+        "#{prefix}=#{v}"
+      when Hash, Chef::Node::Attribute
+        prefix += "." unless prefix.empty?
+        return v.map {|key, value| compile_attr("#{prefix}#{key}", value)}.flatten
+      else
+        raise Chef::Exceptions::UnsupportedAction, "Sysctl cookbook can't handle values of type: #{v.class}"
+      end
+    end
+  end
+end

providers/param.rb

@@ -0,0 +1,47 @@
+def load_current_resource
+  new_resource.key new_resource.name unless new_resource.key
+end
+
+action :apply do
+  key_path = new_resource.key.split('.')
+  sys_attrs = Mash.new(node[:sysctl][:attributes].to_hash)
+  location = key_path.slice(0, key_path.size - 1).inject(sys_attrs) do |m,o|
+    m[o] ||= {}
+    m[o]
+  end
+  unless(location[key_path.last] == new_resource.value)
+    location[key_path.last] = new_resource.value
+    execute "sysctl[#{new_resource.key}]" do
+      command "sysctl -w #{new_resource.key}=#{new_resource.value}"
+      not_if do
+        %x{sysctl -n #{new_resource.key}}.strip == new_resource.value.to_s
+      end
+    end
+    node.set[:sysctl][:attributes] = sys_attrs
+    new_resource.updated_by_last_action(true)
+  end
+end
+
+action :remove do
+  key_path = new_resource.key.split('.')
+  sys_attrs = Mash.new(node[:sysctl][:attributes].to_hash)
+  location = key_path.slice(0, key_path.size - 1).inject(sys_attrs) do |m,o|
+    m.nil? ? nil : m[o]
+  end
+  if(location && location[key_path.last])
+    location.delete(key_path.last)
+    if(location.empty?)
+      key_path.size.times do |i|
+        int_key = key_path.size - i - 1
+        l = key_path.slice(0, int_key).inject(node[:sysctl][:attributes]) do |m,o|
+          m.nil? ? nil : m[o]
+        end
+        if(l && l[key_path[int_key]] && l[key_path[int_key]].empty?)
+          l.delete(key_path[int_key])
+        end
+      end
+    end
+    node.set[:sysctl][:attributes] = sys_attrs
+    new_resource.updated_by_last_action(true)
+  end
+end

recipes/default.rb

@@ -3,37 +3,40 @@
 # Recipe:: default
 #
 # Copyright 2011, Fewbytes Technologies LTD
+# Copyright 2012, Chris Roberts <[email protected]>
 #
 
-def compile_attr(prefix, v)
-  case v
-  when Array
-    return "#{prefix}=#{v.join(" ")}"
-  when String, Fixnum, Bignum, Float, Symbol
-    "#{prefix}=#{v}"
-  when Hash, Chef::Node::Attribute
-    prefix += "." unless prefix.empty?
-    return v.map {|key, value| compile_attr("#{prefix}#{key}", value)}.flatten
-  else
-    raise Chef::Exceptions::UnsupportedAction, "Sysctl cookbook can't handle values of type: #{v.class}"
-  end
-end
+service "procps"
 
-if node.attribute?(:sysctl)
+sysctl_path = if(node[:sysctl][:conf_dir])
+                File.join(node[:sysctl][:conf_dir], '99-chef-attributes.conf')
+              else
+                node[:sysctl][:allow_sysctl_conf] ? '/etc/sysctl.conf' : nil
+              end
 
-  attr_txt = compile_attr("", node[:sysctl]).join("\n") + "\n"
+if(sysctl_path)
+  template sysctl_path do
+    action :nothing
+    source 'sysctl.conf.erb'
+    mode '0644'
+    notifies :start, resources(:service => 'procps'), :immediately
+    only_if do
+      node[:sysctl][:attributes] && !node[:sysctl][:attributes].empty?
+    end
+  end
 
-  file "/etc/sysctl.d/68-chef-attributes.conf" do
-    content attr_txt
-    mode "0644"
-    notifies :start, "service[procps]", :immediately
+  ruby_block 'sysctl config notifier' do
+    block do
+      true
+    end
+    notifies :create, resources(:template => sysctl_path), :delayed
   end
 end
 
 cookbook_file "/etc/sysctl.d/69-chef-static.conf" do
   ignore_failure true
   mode "0644"
-  notifies :start, "service[procps]", :immediately
+  notifies :start, "service[procps]"
 end
 
 service "procps"

resources/param.rb

@@ -0,0 +1,5 @@
+actions :apply, :remove
+default_action :apply
+
+attribute :key, :kind_of => String
+attribute :value, :required => true

templates/default/sysctl.conf.erb

@@ -0,0 +1,4 @@
+# Dynamically generated file dropped off by Chef!
+
+<%= Sysctl.compile_attr('', node[:sysctl][:attributes]).join("\n") %>
+