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

Commit 7b5fa53

Browse files
author
Sebastian Gumprich
committed
Update kitchen-ansible, remove separate debian install
Due to the new kitchen-ansible version it is now possible to install ansible on all major OS's via a ansible omnibus script which is provided by kitchen ansible. There's no more need to separate the debian tests. Also removed whitespace.
1 parent b6f2229 commit 7b5fa53

File tree

4 files changed

+16
-38
lines changed

4 files changed

+16
-38
lines changed

.kitchen.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ provisioner:
55
name: ansible_playbook
66
test_repo_uri: https://github.com/TelekomLabs/tests-ssh-hardening.git
77
hosts: all
8+
require_ansible_repo: false
9+
require_ansible_omnibus: true
810
platforms:
911
- name: ubuntu-12.04
1012
driver_config:
@@ -30,11 +32,23 @@ platforms:
3032
driver_config:
3133
box: oracle-6.5
3234
box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel65-64.box
35+
- name: debian-6
36+
driver_config:
37+
box: debian-6
38+
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box
39+
- name: debian-7
40+
driver_config:
41+
box: debian-7
42+
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8_chef-provisionerless.box
43+
- name: debian-8
44+
driver_config:
45+
box: debian-8
46+
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box
47+
3348
suites:
3449
- name: default
3550
roles_path: roles
3651
hosts: all
37-
require_ansible_repo: true
3852
ansible_verbose: true
3953
ansible_version: 1.9.2
4054
provisioner:

.kitchen_debian.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

ansible-install.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

roles/ansible-ssh-hardening/templates/opensshd.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ IgnoreUserKnownHosts yes
134134
HostbasedAuthentication no
135135

136136
# Enable PAM to enforce system wide rules
137-
UsePAM {{ 'yes' if ssh_use_pam else 'no' }}
137+
UsePAM {{ 'yes' if ssh_use_pam else 'no' }}
138138

139139
# Disable password-based authentication, it can allow for potentially easier brute-force attacks.
140140
PasswordAuthentication no

0 commit comments

Comments
 (0)