Merge remote-tracking branch 'github/pull/669'

[chef.git] / cookbooks / ohai / resources / plugin.rb

diff --git a/cookbooks/ohai/resources/plugin.rb b/cookbooks/ohai/resources/plugin.rb
index 0c538953d9340c2d283dcce7da7dd99501eed179..7a78a8806c28c605fb22268cb05e5f228cc619ad 100644 (file)
--- a/cookbooks/ohai/resources/plugin.rb
+++ b/cookbooks/ohai/resources/plugin.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: ohai
+# Cookbook:: ohai

 # Resource:: ohai_plugin
 #
 # Resource:: ohai_plugin
 #

-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, OpenStreetMap Foundation

 #
 # 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,33 +17,52 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 default_action :create
 

-property :plugin, :kind_of => String, :name_attribute => true
-property :template_source, :kind_of => String, :required => true
+property :plugin, :kind_of => String, :name_property => true
+property :template, :kind_of => String, :required => [:create]

 
 action :create do
   ohai new_resource.plugin do
     action :nothing
   end
 
 
 action :create do
   ohai new_resource.plugin do
     action :nothing
   end
 

-  template plugin_path do
-    source new_resource.template_source
+  directory "/etc/chef/ohai/plugins" do

     owner "root"
     group "root"
     owner "root"
     group "root"

-    mode 0o644
+    mode "755"
+    recursive true
+  end
+
+  # FIXME: Cleanup of plugins in the old location
+  declare_resource :file, plugin_old_path do
+    action :delete
+    notifies :reload, "ohai[#{new_resource.plugin}]"
+  end
+
+  declare_resource :template, plugin_path do
+    source new_resource.template
+    owner "root"
+    group "root"
+    mode "644"

     notifies :reload, "ohai[#{new_resource.plugin}]"
   end
 end
 
 action :delete do
     notifies :reload, "ohai[#{new_resource.plugin}]"
   end
 end
 
 action :delete do

-  template plugin_path do
+  file plugin_path do

     action :delete
   end
 end
 
 action_class do
     action :delete
   end
 end
 
 action_class do

-  def plugin_path
+  def plugin_old_path

     "/etc/chef/ohai/#{new_resource.plugin}.rb"
   end
     "/etc/chef/ohai/#{new_resource.plugin}.rb"
   end

+
+  def plugin_path
+    "/etc/chef/ohai/plugins/#{new_resource.plugin}.rb"
+  end

 end
 end