Switch culebre, fafnir, ladon and trogdor to squid 4

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

diff --git a/cookbooks/ohai/resources/plugin.rb b/cookbooks/ohai/resources/plugin.rb
index 0c538953d9340c2d283dcce7da7dd99501eed179..54e40108270c24c9a8b0808f6d0f54e4176bdd9c 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,


@@ -20,15 +20,15 @@
 default_action :create
 
 property :plugin, :kind_of => String, :name_attribute => true
 default_action :create
 
 property :plugin, :kind_of => String, :name_attribute => true

-property :template_source, :kind_of => String, :required => true
+property :template, :kind_of => String, :required => true

 
 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
+  declare_resource :template, plugin_path do
+    source new_resource.template

     owner "root"
     group "root"
     mode 0o644
     owner "root"
     group "root"
     mode 0o644


@@ -37,7 +37,7 @@ action :create do
 end
 
 action :delete do
 end
 
 action :delete do

-  template plugin_path do
+  file plugin_path do

     action :delete
   end
 end
     action :delete
   end
 end