Merge d447b60 into cf5b513

CHANGELOG.md

@@ -1,2 +1,33 @@
-# Changelog
+# Change Log
 
+## [1.0.0](https://github.com/dev-sec/chef-apache-hardening/tree/1.0.0) (2016-06-24)
+**Closed issues:**
+
+- Bad twiddle-wakka in metadata [\#19](https://github.com/dev-sec/chef-apache-hardening/issues/19)
+
+**Merged pull requests:**
+
+- switch to docker and use inspec for testing [\#24](https://github.com/dev-sec/chef-apache-hardening/pull/24) ([atomic111](https://github.com/atomic111))
+- upgrade to Berkshelf 4 [\#23](https://github.com/dev-sec/chef-apache-hardening/pull/23) ([chris-rock](https://github.com/chris-rock))
+- update common kitchen.yml platforms [\#22](https://github.com/dev-sec/chef-apache-hardening/pull/22) ([chris-rock](https://github.com/chris-rock))
+- Added a missing dash [\#21](https://github.com/dev-sec/chef-apache-hardening/pull/21) ([efreesen](https://github.com/efreesen))
+- closes \#19 [\#20](https://github.com/dev-sec/chef-apache-hardening/pull/20) ([chris-rock](https://github.com/chris-rock))
+- update common Gemfile for chef11+12 [\#18](https://github.com/dev-sec/chef-apache-hardening/pull/18) ([arlimus](https://github.com/arlimus))
+- common files: centos7 + rubocop [\#17](https://github.com/dev-sec/chef-apache-hardening/pull/17) ([arlimus](https://github.com/arlimus))
+- update common kitchen.yml platforms [\#16](https://github.com/dev-sec/chef-apache-hardening/pull/16) ([arlimus](https://github.com/arlimus))
+- update common readme badges [\#15](https://github.com/dev-sec/chef-apache-hardening/pull/15) ([arlimus](https://github.com/arlimus))
+- updating common files [\#11](https://github.com/dev-sec/chef-apache-hardening/pull/11) ([arlimus](https://github.com/arlimus))
+- update readme and add contributing section [\#10](https://github.com/dev-sec/chef-apache-hardening/pull/10) ([ehaselwanter](https://github.com/ehaselwanter))
+- add some more specs for the hardening code [\#9](https://github.com/dev-sec/chef-apache-hardening/pull/9) ([ehaselwanter](https://github.com/ehaselwanter))
+- add badges to readme [\#8](https://github.com/dev-sec/chef-apache-hardening/pull/8) ([chris-rock](https://github.com/chris-rock))
+- add specs to apache cookbook [\#7](https://github.com/dev-sec/chef-apache-hardening/pull/7) ([ehaselwanter](https://github.com/ehaselwanter))
+- fix alias conf according to gis requirements [\#6](https://github.com/dev-sec/chef-apache-hardening/pull/6) ([ehaselwanter](https://github.com/ehaselwanter))
+- rubocop 0.27 is picky about the Berksfile [\#5](https://github.com/dev-sec/chef-apache-hardening/pull/5) ([ehaselwanter](https://github.com/ehaselwanter))
+- remove o-rwx [\#4](https://github.com/dev-sec/chef-apache-hardening/pull/4) ([ehaselwanter](https://github.com/ehaselwanter))
+- Update common [\#3](https://github.com/dev-sec/chef-apache-hardening/pull/3) ([arlimus](https://github.com/arlimus))
+- fix reload issue. we need a restart action [\#2](https://github.com/dev-sec/chef-apache-hardening/pull/2) ([ehaselwanter](https://github.com/ehaselwanter))
+- add the chef hardeing config [\#1](https://github.com/dev-sec/chef-apache-hardening/pull/1) ([ehaselwanter](https://github.com/ehaselwanter))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gemfile

@@ -6,12 +6,6 @@ gem 'berkshelf',  '~> 4.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('1.9.3')
-  gem 'net-ssh', '~> 2.9'
-end
-
 group :test do
   gem 'rake'
   gem 'chefspec',   '~> 4.2.0'

Rakefile

@@ -48,11 +48,11 @@ end
 
 # Automatically generate a changelog for this project. Only loaded if
 # the necessary gem is installed.
-begin
-  require 'github_changelog_generator/task'
-  GitHubChangelogGenerator::RakeTask.new :changelog
-rescue LoadError
-  puts '>>>>> GitHub Changelog Generator not loaded, omitting tasks'
+
+desc 'Generate the changelog'
+task :changelog do
+  version = File.read('metadata.rb')[/^version '(.*)'$/, 1]
+  system "github_changelog_generator -u dev-sec -p chef-apache-hardening --future-release #{version}"
 end
 
 namespace :test do

gemfile.chef-11

@@ -5,12 +5,6 @@ source 'https://rubygems.org'
 gem 'berkshelf',  '~> 4.0'
 gem 'chef',       '~> 11.18'
 
-# 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('1.9.3')
-  gem 'net-ssh', '~> 2.9'
-end
-
 group :test do
   gem 'rake'
   gem 'chefspec',   '~> 4.1.1'

metadata.rb

@@ -4,7 +4,7 @@
 license 'Apache v2.0'
 description 'Installs and configures a secure apache server'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.9'
+version '1.0.0'
 
 depends 'apache2', '~> 3.2.2'