Merge pull request #49 from hardening-io/new_dir_layout

New dir layout
dev-sec · Oct 22, 2015 · 652474b · 652474b
2 parents d47e64f + 057fffa
commit 652474b
Show file tree

Hide file tree

Showing 31 changed files with 4 additions and 3 deletions.
diff --git 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/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ before_install:
 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 '[defaults]\nroles_path = ../\nhostfile = ./spec/inventory' > ansible.cfg
 
 script:
   - ansible-playbook --syntax-check spec/travis.yml

diff --git 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 → defaults/main.yml b/roles/ansible-os-hardening/defaults/main.yml → defaults/main.yml
diff --git a/roles/ansible-os-hardening/tasks/limits.yml → tasks/limits.yml b/roles/ansible-os-hardening/tasks/limits.yml → tasks/limits.yml
diff --git a/...ansible-os-hardening/tasks/login_defs.yml → tasks/login_defs.yml b/...ansible-os-hardening/tasks/login_defs.yml → tasks/login_defs.yml
diff --git a/roles/ansible-os-hardening/tasks/main.yml → tasks/main.yml b/roles/ansible-os-hardening/tasks/main.yml → tasks/main.yml
diff --git a/...le-os-hardening/tasks/minimize_access.yml → tasks/minimize_access.yml b/...le-os-hardening/tasks/minimize_access.yml → tasks/minimize_access.yml
diff --git a/roles/ansible-os-hardening/tasks/pam.yml → tasks/pam.yml b/roles/ansible-os-hardening/tasks/pam.yml → tasks/pam.yml
diff --git a/roles/ansible-os-hardening/tasks/profile.yml → tasks/profile.yml b/roles/ansible-os-hardening/tasks/profile.yml → tasks/profile.yml
diff --git a/roles/ansible-os-hardening/tasks/rhosts.yml → tasks/rhosts.yml b/roles/ansible-os-hardening/tasks/rhosts.yml → tasks/rhosts.yml
diff --git a/.../ansible-os-hardening/tasks/securetty.yml → tasks/securetty.yml b/.../ansible-os-hardening/tasks/securetty.yml → tasks/securetty.yml
diff --git a/.../ansible-os-hardening/tasks/suid_sgid.yml → tasks/suid_sgid.yml b/.../ansible-os-hardening/tasks/suid_sgid.yml → tasks/suid_sgid.yml
diff --git a/roles/ansible-os-hardening/tasks/sysctl.yml → tasks/sysctl.yml b/roles/ansible-os-hardening/tasks/sysctl.yml → tasks/sysctl.yml
diff --git a/...ible-os-hardening/tasks/user_accounts.yml → tasks/user_accounts.yml b/...ible-os-hardening/tasks/user_accounts.yml → tasks/user_accounts.yml
diff --git a/roles/ansible-os-hardening/tasks/yum.yml → tasks/yum.yml b/roles/ansible-os-hardening/tasks/yum.yml → tasks/yum.yml
diff --git a/...ble-os-hardening/templates/limits.conf.j2 → templates/limits.conf.j2 b/...ble-os-hardening/templates/limits.conf.j2 → templates/limits.conf.j2
diff --git a/...ible-os-hardening/templates/login.defs.j2 → templates/login.defs.j2 b/...ible-os-hardening/templates/login.defs.j2 → templates/login.defs.j2
diff --git a/...ansible-os-hardening/templates/modules.j2 → templates/modules.j2 b/...ansible-os-hardening/templates/modules.j2 → templates/modules.j2
diff --git a/...le-os-hardening/templates/pam_passwdqd.j2 → templates/pam_passwdqd.j2 b/...le-os-hardening/templates/pam_passwdqd.j2 → templates/pam_passwdqd.j2
diff --git a/...ible-os-hardening/templates/pam_tally2.j2 → templates/pam_tally2.j2 b/...ible-os-hardening/templates/pam_tally2.j2 → templates/pam_tally2.j2
diff --git a/...le-os-hardening/templates/profile.conf.j2 → templates/profile.conf.j2 b/...le-os-hardening/templates/profile.conf.j2 → templates/profile.conf.j2
diff --git a/...-hardening/templates/rhel_libuser.conf.j2 → templates/rhel_libuser.conf.j2 b/...-hardening/templates/rhel_libuser.conf.j2 → templates/rhel_libuser.conf.j2
diff --git a/...ardening/templates/rhel_sysconfig_init.j2 → templates/rhel_sysconfig_init.j2 b/...ardening/templates/rhel_sysconfig_init.j2 → templates/rhel_sysconfig_init.j2
diff --git a/...s-hardening/templates/rhel_system_auth.j2 → templates/rhel_system_auth.j2 b/...s-hardening/templates/rhel_system_auth.j2 → templates/rhel_system_auth.j2
diff --git a/...sible-os-hardening/templates/securetty.j2 → templates/securetty.j2 b/...sible-os-hardening/templates/securetty.j2 → templates/securetty.j2
diff --git a/roles/ansible-os-hardening/vars/Debian.yml → vars/Debian.yml b/roles/ansible-os-hardening/vars/Debian.yml → vars/Debian.yml
diff --git a/...nsible-os-hardening/vars/Oracle Linux.yml → vars/Oracle Linux.yml b/...nsible-os-hardening/vars/Oracle Linux.yml → vars/Oracle Linux.yml
diff --git a/roles/ansible-os-hardening/vars/RedHat.yml → vars/RedHat.yml b/roles/ansible-os-hardening/vars/RedHat.yml → vars/RedHat.yml
diff --git a/roles/ansible-os-hardening/vars/main.yml → vars/main.yml b/roles/ansible-os-hardening/vars/main.yml → vars/main.yml
diff --git a/roles/ansible-os-hardening/vars/sysctl.yml → vars/sysctl.yml b/roles/ansible-os-hardening/vars/sysctl.yml → vars/sysctl.yml