Skip to content

Commit d447b60

Browse files
committed
remove net-ssh version pin, because we removed ruby 1.9.3 support
Signed-off-by: Patrick Münch <[email protected]> bump version to 1.0.0 Signed-off-by: Patrick Münch <[email protected]> remove net-ssh version pin and bump version to 1.0.0 bump version to 1.0.0
1 parent dd30ccf commit d447b60

File tree

4 files changed

+33
-18
lines changed

4 files changed

+33
-18
lines changed

CHANGELOG.md

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,33 @@
11
# Change Log
22

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

532

633
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gemfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ gem 'berkshelf', '~> 4.0'
66
gem 'chef', '>= 12.0'
77
gem 'inspec', '~> 0'
88

9-
# pin dependency for Ruby 1.9.3 since bundler is not
10-
# detecting that net-ssh 3 does not work with 1.9.3
11-
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
12-
gem 'net-ssh', '~> 2.9'
13-
end
14-
159
group :test do
1610
gem 'rake'
1711
gem 'chefspec', '~> 4.2.0'

Rakefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ end
4848

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

5858
namespace :test do

gemfile.chef-11

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ source 'https://rubygems.org'
55
gem 'berkshelf', '~> 4.0'
66
gem 'chef', '~> 11.18'
77

8-
# pin dependency for Ruby 1.9.3 since bundler is not
9-
# detecting that net-ssh 3 does not work with 1.9.3
10-
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
11-
gem 'net-ssh', '~> 2.9'
12-
end
13-
148
group :test do
159
gem 'rake'
1610
gem 'chefspec', '~> 4.1.1'

0 commit comments

Comments
 (0)