Merge 2c79f82 into 2acd940

.kitchen.yml

@@ -3,7 +3,7 @@ driver:
   name: vagrant
 provisioner:
   name: chef_solo
-  require_chef_omnibus: 11.16.4
+  require_chef_omnibus: 12.5
   test_repo_uri: https://github.com/TelekomLabs/tests-mysql-hardening.git
 platforms:
 - name: ubuntu-12.04
@@ -49,4 +49,11 @@ platforms:
 suites:
 - name: default
   run_list:
-  - role[mysql]
+  - recipe[chef-solo-search]
+  - recipe[apt]
+  - recipe[mysql::server]
+  - recipe[mysql-hardening]
+  attributes:
+    mysql:
+      server_root_password: 'iloverandompasswordsbutthiswilldo'
+      server_debian_password: 'iloverandompasswordsbutthiswilldo'

.travis.yml

@@ -1,14 +1,11 @@
 ---
+branches:
+only:
+  - master
 rvm:
-- 1.9.3
-- 2.0.0
-- 2.1.3
+- 2.2.5
 gemfile:
 - Gemfile
 - gemfile.chef-11
 language: ruby
-bundler_args: "--without development integration openstack"
-matrix:
-  exclude:
-  - rvm: 1.9.3
-    gemfile: Gemfile
+bundler_args: "--without development integration"

Gemfile

@@ -1,19 +1,23 @@
 # encoding: utf-8
-
 source 'https://rubygems.org'
 
-gem 'berkshelf',  '~> 3.0'
+gem 'berkshelf',  '~> 4.0'
 gem 'chef',       '>= 12.0'
 
 group :test do
   gem 'rake'
-  gem 'chefspec',   '~> 4.2.0'
-  gem 'foodcritic', '~> 4.0'
-  gem 'thor-foodcritic'
+  gem 'chefspec', '>= 4.5'
+  gem 'foodcritic', '~> 6.0'
   gem 'rubocop',    '~> 0.28.0'
   gem 'coveralls',  require: false
 end
 
+group :integration do
+  gem 'test-kitchen', '~> 1.10'
+  gem 'kitchen-vagrant'
+  gem 'kitchen-sharedtests', '~> 0.2.0'
+end
+
 group :development do
   gem 'guard'
   gem 'guard-rspec'
@@ -22,12 +26,6 @@ group :development do
   gem 'guard-foodcritic'
 end
 
-group :integration do
-  gem 'test-kitchen', '~> 1.0'
-  gem 'kitchen-vagrant'
-  gem 'kitchen-sharedtests', '~> 0.2.0'
-end
-
-group :openstack do
-  gem 'kitchen-openstack'
+group :tools do
+  gem 'github_changelog_generator', '~> 1'
 end

README.md

@@ -130,7 +130,7 @@ bundle install
 bundle exec rake lint
 
 # Fetch tests
-bundle exec thor kitchen:fetch-remote-tests
+git clone https://github.com/dev-sec/tests-mysql-hardening test/integration
 
 # fast test on one machine
 bundle exec kitchen test default-ubuntu-1204

gemfile.chef-11

@@ -1,19 +1,29 @@
 # encoding: utf-8
-
 source 'https://rubygems.org'
 
-gem 'berkshelf',  '~> 3.0'
-gem 'chef',       '~> 11.16'
+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'
-  gem 'foodcritic', '~> 3.0'
-  gem 'thor-foodcritic'
+  gem 'chefspec', '>= 4.5'
+  gem 'foodcritic', '~> 6.0'
   gem 'rubocop',    '~> 0.28.0'
   gem 'coveralls',  require: false
 end
 
+group :integration do
+  gem 'test-kitchen', '~> 1.10'
+  gem 'kitchen-vagrant'
+  gem 'kitchen-sharedtests', '~> 0.2.0'
+end
+
 group :development do
   gem 'guard'
   gem 'guard-rspec'
@@ -22,12 +32,6 @@ group :development do
   gem 'guard-foodcritic'
 end
 
-group :integration do
-  gem 'test-kitchen', '~> 1.0'
-  gem 'kitchen-vagrant'
-  gem 'kitchen-sharedtests', '~> 0.2.0'
-end
-
-group :openstack do
-  gem 'kitchen-openstack'
+group :tools do
+  gem 'github_changelog_generator', '~> 1'
 end

metadata.rb

@@ -33,4 +33,7 @@
 supports 'centos'
 supports 'fedora'
 supports 'debian'
-supports 'ubuntu'
+supports 'ubuntu'
+
+source_url 'https://github.com/dev-sec/chef-mysql-hardening'
+issues_url 'https://github.com/dev-sec/chef-mysql-hardening/issues'