Merge pull request #1 from pulselocker/arktos65_ohai

Bug fixes to support Ohai 4.x plugin.

Author: arktos65

.kitchen.yml

@@ -13,6 +13,9 @@ platforms:
   - name: ubuntu-12.04
     run_list:
         - recipe[apt]
+  - name: ubuntu-14.04
+    run_list:
+        - recipe[apt]
 
 suites:
   - name: default

CHANGELOG.md

@@ -2,10 +2,17 @@ nginx Cookbook CHANGELOG
 ========================
 This file is used to list changes made in each version of the nginx cookbook.
 
+v2.7.7 / 2016-06-14
+==================
+
+* Fixed the ohai recipe to work with V4.1.0 of the ohai cookbook.
+* Added Test Kitchen tests for Ubuntu 14.04.
+* Version bumped gems in the Gemfile including Berkshelf, rubocop, foodcritic.
+  
 v2.7.6 / 2015-03-17
 ==================
 
-  * Bugfix sites do not need a .conf suffix anymore, [#338][] [@runningman84][]
+* Bugfix sites do not need a .conf suffix anymore, [#338][] [@runningman84][]
 
 v2.7.5 (2015-03-17)
 -------------------

Gemfile

@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
 
 group :lint do
-  gem 'foodcritic', '~> 4.0'
-  gem 'rubocop',    '~> 0.27.0'
+  gem 'foodcritic', '~> 6.3.0'
+  gem 'rubocop',    '~> 0.40.0'
 end
 
 group :unit do
-  gem 'berkshelf', '~> 3.2.0'
+  gem 'berkshelf', '~> 4.3.0'
   gem 'chefspec',  '~> 4.1.0'
 end
 

metadata.rb

@@ -3,15 +3,15 @@
 maintainer_email  '[email protected]'
 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'
 depends 'runit',           '~> 1.2'
 depends 'yum-epel',        '~> 0.3'
 

recipes/ohai_plugin.rb

@@ -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'
+end