From 9f87aa72d06b46e4b9f4c0763b0292c8f2086265 Mon Sep 17 00:00:00 2001 From: uk-bolly Date: Tue, 23 Apr 2024 13:54:58 +0100 Subject: [PATCH] audit only moved to prelim (#73) Signed-off-by: Mark Bolwell --- tasks/main.yml | 17 ----------------- tasks/prelim.yml | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index b8ad6ba..5d33707 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -92,23 +92,6 @@ - prelim_tasks - always -- name: Include audit specific variables - when: - - run_audit or audit_only - - setup_audit - tags: - - setup_audit - - run_audit - ansible.builtin.include_vars: audit.yml - -- name: Include pre-remediation audit tasks - when: - - run_audit or audit_only - - setup_audit - tags: - - run_audit - ansible.builtin.import_tasks: pre_remediation_audit.yml - - name: Run Section 1 tasks when: - amzn2023cis_section1 diff --git a/tasks/prelim.yml b/tasks/prelim.yml index 3214e45..ed47db2 100644 --- a/tasks/prelim.yml +++ b/tasks/prelim.yml @@ -3,6 +3,23 @@ # Preliminary tasks that should always be run # List users in order to look files inside each home directory +- name: Include audit specific variables + when: + - run_audit or audit_only + - setup_audit + tags: + - setup_audit + - run_audit + ansible.builtin.include_vars: audit.yml + +- name: Include pre-remediation audit tasks + when: + - run_audit or audit_only + - setup_audit + tags: + - run_audit + ansible.builtin.import_tasks: pre_remediation_audit.yml + - name: "PRELIM | AUDIT | Interactive Users" tags: - always