Skip to content

Commit

Permalink
Merge 5551f98 into 6b4ac2a
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-rock committed Aug 18, 2016
2 parents 6b4ac2a + 5551f98 commit 2f0b606
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -2,7 +2,7 @@
rvm:
- 2.3.1
language: ruby
bundler_args: "--without development integration openstack"
bundler_args: "--without development integration"
gemfile:
- Gemfile
- gemfile.chef-11
2 changes: 0 additions & 2 deletions Gemfile
Expand Up @@ -16,7 +16,6 @@ group :test do
gem 'rake'
gem 'chefspec', '~> 4.2.0'
gem 'foodcritic', '~> 4.0'
gem 'thor-foodcritic'
gem 'rubocop', '~> 0.28.0'
gem 'coveralls', require: false
gem 'bundler', '~> 1.5'
Expand All @@ -36,7 +35,6 @@ group :integration do
gem 'test-kitchen', '~> 1.0'
gem 'kitchen-vagrant'
gem 'kitchen-dokken'
gem 'kitchen-sharedtests', '~> 0.2.0'
gem 'kitchen-inspec', '~> 0.9'
gem 'concurrent-ruby', '~> 0.9'
end
Expand Down
3 changes: 0 additions & 3 deletions README.md
Expand Up @@ -139,9 +139,6 @@ bundle install
# Do lint checks
bundle exec rake lint

# Fetch tests
bundle exec thor kitchen:fetch-remote-tests

# fast test on one machine
bundle exec kitchen test default-ubuntu-1204

Expand Down
10 changes: 0 additions & 10 deletions Thorfile

This file was deleted.

1 change: 0 additions & 1 deletion gemfile.chef-11
Expand Up @@ -31,5 +31,4 @@ end
group :integration do
gem 'test-kitchen', '~> 1.0'
gem 'kitchen-vagrant'
gem 'kitchen-sharedtests', '~> 0.2.0'
end
3 changes: 3 additions & 0 deletions metadata.rb
Expand Up @@ -42,3 +42,6 @@
recipe 'os-hardening::securetty', 'limit the allowed TTYs for root login'
recipe 'os-hardening::suid_sgid', 'reduce SUID and SGID bits in the filesystem'
recipe 'os-hardening::sysctl', 'set sane sysctl values'

source_url 'https://github.com/dev-sec/chef-os-hardening'
issues_url 'https://github.com/dev-sec/chef-os-hardening/issues'

0 comments on commit 2f0b606

Please sign in to comment.