Merge branch 'master' into master

Author: chris-rock

Berksfile

@@ -4,4 +4,4 @@ source 'https://supermarket.chef.io'
 
 metadata
 
-cookbook 'apt'
+cookbook 'apt'

CHANGELOG.md

@@ -1,12 +1,18 @@
 # Change Log
 
-## [1.0.0](https://github.com/dev-sec/chef-nginx-hardening/tree/1.0.0) (2016-06-03)
+## [v1.1.0](https://github.com/dev-sec/chef-nginx-hardening/tree/v1.1.0) (2016-11-20)
 **Closed issues:**
 
+- release version [\#30](https://github.com/dev-sec/chef-nginx-hardening/issues/30)
 - Improve detection [\#5](https://github.com/dev-sec/chef-nginx-hardening/issues/5)
 
 **Merged pull requests:**
 
+- delete duplicate entry about server tokens [\#36](https://github.com/dev-sec/chef-nginx-hardening/pull/36) ([rndmh3ro](https://github.com/rndmh3ro))
+- Add fedora to platform\_family. [\#35](https://github.com/dev-sec/chef-nginx-hardening/pull/35) ([chris-rock](https://github.com/chris-rock))
+- remove net-ssh version pin and fix chefspec issue [\#34](https://github.com/dev-sec/chef-nginx-hardening/pull/34) ([atomic111](https://github.com/atomic111))
+- remove ubuntu 15.10 from kitchen.yml [\#32](https://github.com/dev-sec/chef-nginx-hardening/pull/32) ([atomic111](https://github.com/atomic111))
+- bump version to 1.0.0 [\#31](https://github.com/dev-sec/chef-nginx-hardening/pull/31) ([chris-rock](https://github.com/chris-rock))
 - change hardeni-io in dev-sec [\#29](https://github.com/dev-sec/chef-nginx-hardening/pull/29) ([atomic111](https://github.com/atomic111))
 - migrate to kitchen-dokken and create content for README.md [\#28](https://github.com/dev-sec/chef-nginx-hardening/pull/28) ([atomic111](https://github.com/atomic111))
 - update common kitchen.yml platforms [\#27](https://github.com/dev-sec/chef-nginx-hardening/pull/27) ([chris-rock](https://github.com/chris-rock))

Gemfile

@@ -4,7 +4,14 @@ source 'https://rubygems.org'
 
 gem 'berkshelf',  '~> 5.0'
 gem 'chef',       '>= 12.0'
-gem 'inspec',     '~> 0'
+
+# pin dependency for Ruby 1.9.3 since bundler is not
+# detecting that net-ssh 3 does not work with 1.9.3
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
+  gem 'listen', '~> 3.0.0'
+  gem 'ruby_dep', '~> 1.3.0'
+  gem 'rack', '< 2.0'
+end
 
 group :test do
   gem 'rake'

Rakefile

@@ -1,10 +1,17 @@
 #!/usr/bin/env rake
 
+<<<<<<< master
 # Style tests. cookstyle (rubocop) and Foodcritic
 namespace :style do
   begin
     require 'cookstyle'
     require 'rubocop/rake_task'
+=======
+require 'foodcritic'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+require 'chef/cookbook/metadata'
+>>>>>>> master
 
     desc 'Run Ruby style checks'
     RuboCop::RakeTask.new(:ruby)
@@ -69,8 +76,15 @@ task default: %w(style spec)
 # Automatically generate a changelog for this project. Only loaded if
 # the necessary gem is installed.
 begin
+  # read version from metadata
+  metadata = Chef::Cookbook::Metadata.new
+  metadata.instance_eval(File.read('metadata.rb'))
+
+  # build changelog
   require 'github_changelog_generator/task'
-  GitHubChangelogGenerator::RakeTask.new :changelog
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    config.future_release = "v#{metadata.version}"
+  end
 rescue LoadError
   puts '>>>>> GitHub Changelog Generator not loaded, omitting tasks'
 end

metadata.rb

@@ -21,9 +21,22 @@
 license          'Apache 2.0'
 description      'Configures nginx hardening'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+<<<<<<< master
 version          '1.0.0'
 
 depends 'chef_nginx', '>= 4.0'
+=======
+version          "1.1.0"
+
+issues_url       'https://github.com/dev-sec/chef-nginx-hardening/issues'
+source_url       'https://github.com/dev-sec/chef-nginx-hardening'
+
+supports 'debian', '>= 7'
+supports 'ubuntu', '>= 12.04'
+supports 'centos', '>= 6.6'
+
+depends 'chef_nginx'
+>>>>>>> master
 depends 'openssl'
 
 recipe 'nginx-hardening::default', 'configures nginx for hardening'

spec/recipes/default_spec.rb

@@ -21,7 +21,6 @@
   before { allow_any_instance_of(Chef::Recipe).to receive(:search) }
   let(:runner) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04') }
   let(:node) { runner.node }
-  let(:chef_run) { runner.converge('chef_nginx::default', described_recipe) }
 
   before do
     stub_command('/usr/sbin/apache2 -t')