Skip to content
This repository was archived by the owner on Dec 26, 2020. It is now read-only.

Commit d07f601

Browse files
committed
Merge pull request #44 from hardening-io/new_dir_layout
New dir layout. Fix #43
2 parents 4997baa + ec7cac7 commit d07f601

File tree

14 files changed

+11
-5
lines changed

14 files changed

+11
-5
lines changed

.kitchen.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
22
driver:
33
name: vagrant
4+
transport:
5+
name: rsync
46
provisioner:
57
name: ansible_playbook
68
test_repo_uri: https://github.com/TelekomLabs/tests-ssh-hardening.git
@@ -44,12 +46,14 @@ platforms:
4446
driver_config:
4547
box: debian-8
4648
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box
47-
49+
verifier:
50+
ruby_bindir: '/usr/bin'
4851
suites:
4952
- name: default
50-
roles_path: roles
5153
hosts: all
5254
ansible_verbose: true
5355
ansible_version: 1.9.2
56+
ansible_diff: true
57+
roles_path: ../ansible-ssh-hardening/
5458
provisioner:
5559
playbook: test/integration/playbooks/default.yml

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ before_install:
66
- sudo apt-get install -qq python-apt python-pycurl
77
install:
88
- pip install ansible
9-
- echo -e 'localhost ansible_connection=local' > spec/inventory
10-
- echo -e '[defaults]\nroles_path = ./roles\nhostfile = ./spec/inventory' > ansible.cfg
9+
- echo -e 'localhost ansible_connection=local' > spec/inventory
10+
- echo -e '[defaults]\nroles_path = ../\nhostfile = ./spec/inventory' > ansible.cfg
1111
script:
1212
- ansible-playbook --syntax-check spec/travis.yml
1313
- ansible-playbook --sudo -v --diff spec/travis.yml

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ group :integration do
2020
gem 'kitchen-ansible'
2121
gem 'kitchen-vagrant'
2222
gem 'kitchen-sharedtests', '~> 0.2.0'
23+
gem 'kitchen-sync'
24+
gem 'kitchen-transport-rsync'
2325
end
2426

2527
group :openstack do

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ This role provides secure ssh-client and ssh-server configurations.
4242

4343
- hosts: localhost
4444
roles:
45-
- ansible-ssh-hardening
45+
- hardening.ssh-hardening
4646

4747
## Local Testing
4848

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)