Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

updated ohai recipe to work with v4.1.0 of the ohai cookbook #409

Closed
wants to merge 1 commit into from
+10 −9
Closed

updated ohai recipe to work with v4.1.0 of the ohai cookbook #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ nginx Cookbook CHANGELOG
========================
This file is used to list changes made in each version of the nginx cookbook.

v2.7.7 / 2016-06-01
==================

* Fixed the ohai recipe to work with V4.1.0 of the ohai cookbook.

v2.7.6 / 2015-03-17
==================

Expand Down
4 changes: 2 additions & 2 deletions metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
maintainer_email 'cookbooks@chef.io'
license 'Apache 2.0'
description 'Installs and configures nginx'
version '2.7.6'
version '2.7.7'

recipe 'nginx', 'Installs nginx package and sets up configuration with Debian apache style with sites-enabled/sites-available'
recipe 'nginx::source', 'Installs nginx from source and sets up configuration with Debian apache style with sites-enabled/sites-available'

depends 'apt', '~> 2.2'
depends 'bluepill', '~> 2.3'
depends 'build-essential', '~> 2.0'
depends 'ohai', '~> 2.0'
depends 'ohai', '~> 4.1.0'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why such strict versioning being used here? Shouldn't ~> 4.0 be enough?

depends 'runit', '~> 1.2'
depends 'yum-epel', '~> 0.3'

Expand Down
10 changes: 3 additions & 7 deletions recipes/ohai_plugin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,8 @@
action :nothing
end

template "#{node['ohai']['plugin_path']}/nginx.rb" do
source 'plugins/nginx.rb.erb'
owner 'root'
group node['root_group']
mode '0755'
ohai_plugin 'nginx' do
source_file 'plugins/nginx.rb.erb'
resource :template
notifies :reload, 'ohai[reload_nginx]', :immediately
end

include_recipe 'ohai::default'