From 1f90fef6ddf4ac13919778c4d8cfd73562479dfb Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Thu, 26 Sep 2024 07:45:02 +0100 Subject: [PATCH 1/2] Updated thanks to @mathf Signed-off-by: Mark Bolwell --- tasks/section_2/cis_2.2.x.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tasks/section_2/cis_2.2.x.yml b/tasks/section_2/cis_2.2.x.yml index cc049c2..a4da8f1 100644 --- a/tasks/section_2/cis_2.2.x.yml +++ b/tasks/section_2/cis_2.2.x.yml @@ -61,7 +61,9 @@ - NIST800-53R5_CM-11 - telnet ansible.builtin.package: - name: telnet + name: + - telnet + - inetutils-telnet state: absent purge: "{{ ubtu24cis_purge_apt }}" @@ -94,6 +96,8 @@ - NIST800-53R5_CM-11 - ftp ansible.builtin.package: - name: ftp + name: + - ftp + - tnftp state: absent purge: "{{ ubtu24cis_purge_apt }}" From a22741daa9caa107e0faa68cc5b6e2467448eb0b Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Thu, 26 Sep 2024 08:06:51 +0100 Subject: [PATCH 2/2] idempotent improvements, var fixes Signed-off-by: Mark Bolwell --- handlers/main.yml | 2 +- tasks/auditd.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index c557a4e..8b5dda6 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -165,7 +165,7 @@ - name: Auditd rules reload when: - not prelim_auditd_immutable_check or - '"No change" not in ubtu24cis_rule_4_1_3_21_augen_check.stdout' + '"No change" not in ubtu24cis_rule_6_2_3_21_grep -iR augen_check.stdout' ansible.builtin.shell: augenrules --load - name: Audit_immutable_fact diff --git a/tasks/auditd.yml b/tasks/auditd.yml index 39f6450..889e429 100644 --- a/tasks/auditd.yml +++ b/tasks/auditd.yml @@ -1,6 +1,6 @@ --- -- name: "POST | AUDITD | Apply auditd template for section 4.1.3.x" +- name: "POST | AUDITD | Apply auditd template for section 6.2.4.x" when: update_audit_template ansible.builtin.template: src: audit/99_auditd.rules.j2