+++ /dev/null
-#
-# Cookbook Name:: chef
-# Definition:: ohai_plugin
-#
-# Copyright 2012, 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
-#
-# http://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,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-define :ohai_plugin, :action => [:create, :delete] do
- plugin_name = params[:name]
- plugin_action = params[:action]
-
- if plugin_action.include?(:create)
- ohai plugin_name do
- action :nothing
- end
-
- template "/etc/chef/ohai/#{plugin_name}.rb" do
- source params[:template]
- owner "root"
- group "root"
- mode 0644
- notifies :reload, "ohai[#{plugin_name}]"
- end
- elsif plugin_action.include?(:delete)
- template "/etc/chef/ohai/#{plugin_name}.rb" do
- action :delete
- end
- end
-end
depends "apache"
depends "apt"
depends "git"
+depends "ohai"
mode 0644
end
-directory "/etc/chef/ohai" do
+directory node[:ohai][:plugin_dir] do
owner "root"
group "root"
mode 0755
# Make our plugins visible to ohai
-Ohai::Config[:plugin_path] << "/etc/chef/ohai"
+Ohai::Config[:plugin_path] << "<%= node[:ohai][:plugin_dir] %>"
--- /dev/null
+Cookbook
+========
+TODO: Enter the cookbook description here.
+
+e.g.
+This cookbook makes your favorite breakfast sandwich.
+
+Requirements
+------------
+TODO: List your cookbook requirements. Be sure to include any requirements this cookbook has on platforms, libraries, other cookbooks, packages, operating systems, etc.
+
+Attributes
+----------
+TODO: List you cookbook attributes here.
+
+Usage
+-----
+TODO: Write usage instructions for each cookbook.
+
+Contributing
+------------
+TODO: (optional) If this is a public cookbook, detail the process for contributing. If this is a private cookbook, remove this section.
+
+e.g.
+1. Fork the repository on Github
+2. Create a named feature branch (like `add_component_x`)
+3. Write your change
+4. Write tests for your change (if applicable)
+5. Run the tests, ensuring they all pass
+6. Submit a Pull Request using Github
+
+License and Authors
+-------------------
+Authors: TODO: List authors
--- /dev/null
+# Plugin directory
+default[:ohai][:plugin_dir] = "/etc/chef/ohai"
--- /dev/null
+name "ohai"
+maintainer "OpenStreetMap Administrators"
+maintainer_email "admins@openstreetmap.org"
+license "Apache 2.0"
+description "Configures ohai"
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version "1.0.0"
--- /dev/null
+#
+# Cookbook Name:: ohai
+# Provider:: ohai_plugin
+#
+# 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
+#
+# http://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,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+def whyrun_supported?
+ true
+end
+
+use_inline_resources
+
+action :create do
+ ohai new_resource.name do
+ action :nothing
+ end
+
+ template plugin_path do
+ source new_resource.template
+ owner "root"
+ group "root"
+ mode 0644
+ notifies :reload, "ohai[#{new_resource.name}]"
+ end
+end
+
+action :delete do
+ template plugin_path do
+ action :delete
+ end
+end
+
+def plugin_path
+ "/etc/chef/ohai/#{new_resource.name}.rb"
+end
--- /dev/null
+#
+# Cookbook Name:: ohai
+# Resource:: ohai_plugin
+#
+# 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
+#
+# http://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,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+actions :create, :delete
+default_action :create
+
+attribute :name, :kind_of => String, :name_attribute => true
+attribute :template, :kind_of => String, :required => true
description "Installs and configures postgresql"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "1.0.0"
-depends "chef"
+depends "ohai"
attribute "postgresql",
:display_name => "PostgreSQL",