Merge pull request #44 from hardening-io/new_dir_layout

New dir layout. Fix #43

Author: chris-rock

.kitchen.yml

@@ -1,6 +1,8 @@
 ---
 driver:
   name: vagrant
+transport:
+  name: rsync
 provisioner:
   name: ansible_playbook
   test_repo_uri: https://github.com/TelekomLabs/tests-ssh-hardening.git
@@ -44,12 +46,14 @@ platforms:
   driver_config:
     box: debian-8
     box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box
-
+verifier:
+  ruby_bindir: '/usr/bin'
 suites:
 - name: default
-  roles_path: roles
   hosts: all
   ansible_verbose: true
   ansible_version: 1.9.2
+  ansible_diff: true
+  roles_path: ../ansible-ssh-hardening/
   provisioner:
     playbook: test/integration/playbooks/default.yml

.travis.yml

@@ -6,8 +6,8 @@ before_install:
  - sudo apt-get install -qq python-apt python-pycurl
 install:
   - pip install ansible
-  - echo -e 'localhost  ansible_connection=local' > spec/inventory
-  - echo -e '[defaults]\nroles_path = ./roles\nhostfile = ./spec/inventory' > ansible.cfg
+  - echo -e 'localhost ansible_connection=local' > spec/inventory
+  - echo -e '[defaults]\nroles_path = ../\nhostfile = ./spec/inventory' > ansible.cfg
 script:
   - ansible-playbook --syntax-check spec/travis.yml
   - ansible-playbook --sudo -v --diff spec/travis.yml

Gemfile

@@ -20,6 +20,8 @@ group :integration do
   gem 'kitchen-ansible'
   gem 'kitchen-vagrant'
   gem 'kitchen-sharedtests', '~> 0.2.0'
+  gem 'kitchen-sync'
+  gem 'kitchen-transport-rsync'
 end
 
 group :openstack do

README.md

@@ -42,7 +42,7 @@ This role provides secure ssh-client and ssh-server configurations.
 
     - hosts: localhost
       roles:
-        - ansible-ssh-hardening
+        - hardening.ssh-hardening
 
 ## Local Testing