diff --git a/.kitchen.yml b/.kitchen.yml index b63b56ec..6cc1b779 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -1,6 +1,8 @@ --- driver: name: vagrant +transport: + name: rsync provisioner: name: ansible_playbook test_repo_uri: https://github.com/TelekomLabs/tests-os-hardening.git @@ -48,7 +50,6 @@ verifier: ruby_bindir: '/usr/bin' suites: - name: default - roles_path: roles hosts: all ansible_verbose: true ansible_version: 1.9.2 diff --git a/README.md b/README.md index f8c4f621..ff5973db 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ We remove the following packages: - hosts: localhost roles: - - ansible-os-hardening + - hardening.os-hardening ## Local Testing diff --git a/roles/ansible-os-hardening/defaults/main.yml b/defaults/main.yml similarity index 100% rename from roles/ansible-os-hardening/defaults/main.yml rename to defaults/main.yml diff --git a/roles/ansible-os-hardening/tasks/limits.yml b/tasks/limits.yml similarity index 100% rename from roles/ansible-os-hardening/tasks/limits.yml rename to tasks/limits.yml diff --git a/roles/ansible-os-hardening/tasks/login_defs.yml b/tasks/login_defs.yml similarity index 100% rename from roles/ansible-os-hardening/tasks/login_defs.yml rename to tasks/login_defs.yml diff --git a/roles/ansible-os-hardening/tasks/main.yml b/tasks/main.yml similarity index 100% rename from roles/ansible-os-hardening/tasks/main.yml rename to tasks/main.yml diff --git a/roles/ansible-os-hardening/tasks/minimize_access.yml b/tasks/minimize_access.yml similarity index 100% rename from roles/ansible-os-hardening/tasks/minimize_access.yml rename to tasks/minimize_access.yml diff --git a/roles/ansible-os-hardening/tasks/pam.yml b/tasks/pam.yml similarity index 100% rename from roles/ansible-os-hardening/tasks/pam.yml rename to tasks/pam.yml diff --git a/roles/ansible-os-hardening/tasks/profile.yml b/tasks/profile.yml similarity index 100% rename from roles/ansible-os-hardening/tasks/profile.yml rename to tasks/profile.yml diff --git a/roles/ansible-os-hardening/tasks/rhosts.yml b/tasks/rhosts.yml similarity index 100% rename from roles/ansible-os-hardening/tasks/rhosts.yml rename to tasks/rhosts.yml diff --git a/roles/ansible-os-hardening/tasks/securetty.yml b/tasks/securetty.yml similarity index 100% rename from roles/ansible-os-hardening/tasks/securetty.yml rename to tasks/securetty.yml diff --git a/roles/ansible-os-hardening/tasks/suid_sgid.yml b/tasks/suid_sgid.yml similarity index 100% rename from roles/ansible-os-hardening/tasks/suid_sgid.yml rename to tasks/suid_sgid.yml diff --git a/roles/ansible-os-hardening/tasks/sysctl.yml b/tasks/sysctl.yml similarity index 100% rename from roles/ansible-os-hardening/tasks/sysctl.yml rename to tasks/sysctl.yml diff --git a/roles/ansible-os-hardening/tasks/user_accounts.yml b/tasks/user_accounts.yml similarity index 100% rename from roles/ansible-os-hardening/tasks/user_accounts.yml rename to tasks/user_accounts.yml diff --git a/roles/ansible-os-hardening/tasks/yum.yml b/tasks/yum.yml similarity index 100% rename from roles/ansible-os-hardening/tasks/yum.yml rename to tasks/yum.yml diff --git a/roles/ansible-os-hardening/templates/limits.conf.j2 b/templates/limits.conf.j2 similarity index 100% rename from roles/ansible-os-hardening/templates/limits.conf.j2 rename to templates/limits.conf.j2 diff --git a/roles/ansible-os-hardening/templates/login.defs.j2 b/templates/login.defs.j2 similarity index 100% rename from roles/ansible-os-hardening/templates/login.defs.j2 rename to templates/login.defs.j2 diff --git a/roles/ansible-os-hardening/templates/modules.j2 b/templates/modules.j2 similarity index 100% rename from roles/ansible-os-hardening/templates/modules.j2 rename to templates/modules.j2 diff --git a/roles/ansible-os-hardening/templates/pam_passwdqd.j2 b/templates/pam_passwdqd.j2 similarity index 100% rename from roles/ansible-os-hardening/templates/pam_passwdqd.j2 rename to templates/pam_passwdqd.j2 diff --git a/roles/ansible-os-hardening/templates/pam_tally2.j2 b/templates/pam_tally2.j2 similarity index 100% rename from roles/ansible-os-hardening/templates/pam_tally2.j2 rename to templates/pam_tally2.j2 diff --git a/roles/ansible-os-hardening/templates/profile.conf.j2 b/templates/profile.conf.j2 similarity index 100% rename from roles/ansible-os-hardening/templates/profile.conf.j2 rename to templates/profile.conf.j2 diff --git a/roles/ansible-os-hardening/templates/rhel_libuser.conf.j2 b/templates/rhel_libuser.conf.j2 similarity index 100% rename from roles/ansible-os-hardening/templates/rhel_libuser.conf.j2 rename to templates/rhel_libuser.conf.j2 diff --git a/roles/ansible-os-hardening/templates/rhel_sysconfig_init.j2 b/templates/rhel_sysconfig_init.j2 similarity index 100% rename from roles/ansible-os-hardening/templates/rhel_sysconfig_init.j2 rename to templates/rhel_sysconfig_init.j2 diff --git a/roles/ansible-os-hardening/templates/rhel_system_auth.j2 b/templates/rhel_system_auth.j2 similarity index 100% rename from roles/ansible-os-hardening/templates/rhel_system_auth.j2 rename to templates/rhel_system_auth.j2 diff --git a/roles/ansible-os-hardening/templates/securetty.j2 b/templates/securetty.j2 similarity index 100% rename from roles/ansible-os-hardening/templates/securetty.j2 rename to templates/securetty.j2 diff --git a/roles/ansible-os-hardening/vars/Debian.yml b/vars/Debian.yml similarity index 100% rename from roles/ansible-os-hardening/vars/Debian.yml rename to vars/Debian.yml diff --git a/roles/ansible-os-hardening/vars/Oracle Linux.yml b/vars/Oracle Linux.yml similarity index 100% rename from roles/ansible-os-hardening/vars/Oracle Linux.yml rename to vars/Oracle Linux.yml diff --git a/roles/ansible-os-hardening/vars/RedHat.yml b/vars/RedHat.yml similarity index 100% rename from roles/ansible-os-hardening/vars/RedHat.yml rename to vars/RedHat.yml diff --git a/roles/ansible-os-hardening/vars/main.yml b/vars/main.yml similarity index 100% rename from roles/ansible-os-hardening/vars/main.yml rename to vars/main.yml diff --git a/roles/ansible-os-hardening/vars/sysctl.yml b/vars/sysctl.yml similarity index 100% rename from roles/ansible-os-hardening/vars/sysctl.yml rename to vars/sysctl.yml