Merge pull request #42 from dev-sec/fix-github-resolve

fix github resolve

Author: chris-rock

Berksfile

@@ -1,7 +1,6 @@
 # encoding: utf-8
-
 source 'https://supermarket.chef.io'
 
 metadata
 
-cookbook 'apt'
+cookbook 'apt'

CHANGELOG.md

@@ -1,6 +1,19 @@
 # Change Log
 
-## [v1.1.0](https://github.com/dev-sec/chef-nginx-hardening/tree/v1.1.0) (2016-11-20)
+## [v2.0.0](https://github.com/dev-sec/chef-nginx-hardening/tree/v2.0.0) (2016-12-21)
+[Full Changelog](https://github.com/dev-sec/chef-nginx-hardening/compare/v1.1.0...v2.0.0)
+
+**Closed issues:**
+
+- Upload to supermarket? [\#38](https://github.com/dev-sec/chef-nginx-hardening/issues/38)
+
+**Merged pull requests:**
+
+- Added sources and issue url, for the Chef Supermarket reference [\#40](https://github.com/dev-sec/chef-nginx-hardening/pull/40) ([enzor](https://github.com/enzor))
+- Switch to chef\_nginx and update testing [\#39](https://github.com/dev-sec/chef-nginx-hardening/pull/39) ([tas50](https://github.com/tas50))
+- move to chef\_nginx fork [\#37](https://github.com/dev-sec/chef-nginx-hardening/pull/37) ([mburns](https://github.com/mburns))
+
+## [v1.1.0](https://github.com/dev-sec/chef-nginx-hardening/tree/v1.1.0) (2016-11-21)
 **Closed issues:**
 
 - release version [\#30](https://github.com/dev-sec/chef-nginx-hardening/issues/30)

Rakefile

@@ -1,18 +1,10 @@
 #!/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)
   rescue LoadError => e
@@ -26,7 +18,7 @@ require 'chef/cookbook/metadata'
     FoodCritic::Rake::LintTask.new(:chef) do |t|
       t.options = {
         fail_tags: ['any'],
-        progress: true
+        progress: true,
       }
     end
   rescue LoadError
@@ -36,6 +28,7 @@ end
 
 desc 'Run all style checks'
 task style: ['style:chef', 'style:ruby']
+task lint: ['style']
 
 # ChefSpec
 begin
@@ -76,6 +69,8 @@ task default: %w(style spec)
 # Automatically generate a changelog for this project. Only loaded if
 # the necessary gem is installed.
 begin
+  require 'chef/cookbook/metadata'
+
   # read version from metadata
   metadata = Chef::Cookbook::Metadata.new
   metadata.instance_eval(File.read('metadata.rb'))

attributes/hardening.rb

@@ -43,7 +43,7 @@
 
   'more_clear_headers' => [
     '\'Server\'',
-    '\'X-Powered-By\''
+    '\'X-Powered-By\'',
   ],
 
   'client_header_buffer_size' => '1k',
@@ -67,8 +67,8 @@
     'X-Content-Type-Options nosniff',
 
     # XSS filter
-    'X-XSS-Protection "1; mode=block"'
-  ]
+    'X-XSS-Protection "1; mode=block"',
+  ],
 
 }
 

metadata.rb

@@ -21,12 +21,8 @@
 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"
+version          '2.0.0'
 
 issues_url       'https://github.com/dev-sec/chef-nginx-hardening/issues'
 source_url       'https://github.com/dev-sec/chef-nginx-hardening'
@@ -35,8 +31,7 @@
 supports 'ubuntu', '>= 12.04'
 supports 'centos', '>= 6.6'
 
-depends 'chef_nginx'
->>>>>>> master
+depends 'chef_nginx', '>= 4.0'
 depends 'openssl'
 
 recipe 'nginx-hardening::default', 'configures nginx for hardening'

spec/recipes/default_spec.rb

@@ -21,6 +21,7 @@
   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')