From 50d4cd83aabe5d899d37e5e741ce884ee416ccc5 Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Fri, 13 Jan 2023 14:15:50 +0000 Subject: [PATCH] Removed -automated Signed-off-by: Mark Bolwell --- tasks/section_1/cis_1.1.x.yml | 1 - tasks/section_1/cis_1.2.x.yml | 1 - tasks/section_1/cis_1.6.1.x.yml | 7 ------- tasks/section_1/cis_1.8.x.yml | 5 ----- tasks/section_2/cis_2.3.x.yml | 4 ---- tasks/section_4/cis_4.1.2.x.yml | 1 - tasks/section_4/cis_4.1.3.x.yml | 1 - tasks/section_4/cis_4.2.2.x.yml | 6 +----- tasks/section_4/cis_4.2.3.yml | 1 - tasks/section_6/cis_6.1.x.yml | 1 - tasks/warning_facts.yml | 2 +- 11 files changed, 2 insertions(+), 28 deletions(-) diff --git a/tasks/section_1/cis_1.1.x.yml b/tasks/section_1/cis_1.1.x.yml index 77cbf0f..dea0bbc 100644 --- a/tasks/section_1/cis_1.1.x.yml +++ b/tasks/section_1/cis_1.1.x.yml @@ -21,7 +21,6 @@ tags: - level1-server - level2-workstation - - automated - patch - mounts - removable_storage diff --git a/tasks/section_1/cis_1.2.x.yml b/tasks/section_1/cis_1.2.x.yml index 99f24ea..6d64ebb 100644 --- a/tasks/section_1/cis_1.2.x.yml +++ b/tasks/section_1/cis_1.2.x.yml @@ -61,7 +61,6 @@ tags: - level1-server - level1-workstation - - automated - patch - rule_1.2.2 diff --git a/tasks/section_1/cis_1.6.1.x.yml b/tasks/section_1/cis_1.6.1.x.yml index c954f66..89e3161 100644 --- a/tasks/section_1/cis_1.6.1.x.yml +++ b/tasks/section_1/cis_1.6.1.x.yml @@ -9,7 +9,6 @@ tags: - level1-server - level1-workstation - - automated - patch - rule_1.6.1.1 @@ -45,7 +44,6 @@ tags: - level1-server - level1-workstation - - automated - selinux - patch - rule_1.6.1.3 @@ -61,7 +59,6 @@ tags: - level1-server - level1-workstation - - automated - selinux - patch - rule_1.6.1.4 @@ -78,7 +75,6 @@ tags: - level2-server - level2-workstation - - automated - selinux - patch - rule_1.6.1.5 @@ -106,7 +102,6 @@ tags: - level1-server - level1-workstation - - automated - audit - services - rule_1.6.1.6 @@ -120,7 +115,6 @@ - "'setroubleshoot' in ansible_facts.packages" tags: - level1-server - - automated - selinux - patch - rule_1.6.1.7 @@ -134,6 +128,5 @@ tags: - level1-server - level1-workstation - - automated - patch - rule_1.6.1.8 diff --git a/tasks/section_1/cis_1.8.x.yml b/tasks/section_1/cis_1.8.x.yml index 20be846..23dd3c6 100644 --- a/tasks/section_1/cis_1.8.x.yml +++ b/tasks/section_1/cis_1.8.x.yml @@ -9,7 +9,6 @@ - "'gdm' in ansible_facts.packages" tags: - level2-server - - automated - patch - gui - gdm @@ -39,7 +38,6 @@ tags: - level1-server - level1-workstation - - automated - patch - gui - gdm @@ -67,7 +65,6 @@ tags: - level1-server - level1-workstation - - automated - patch - gui - rule_1.8.3 @@ -92,7 +89,6 @@ tags: - level1-server - level2-workstation - - automated - patch - gui - rule_1.8.6 @@ -109,7 +105,6 @@ tags: - level1-server - level1-workstation - - automated - patch - gui - rule_1.8.4 diff --git a/tasks/section_2/cis_2.3.x.yml b/tasks/section_2/cis_2.3.x.yml index 38f24c0..10a0662 100644 --- a/tasks/section_2/cis_2.3.x.yml +++ b/tasks/section_2/cis_2.3.x.yml @@ -11,7 +11,6 @@ tags: - level1-server - level1-workstation - - automated - patch - telnet - rule_2.3.1 @@ -27,7 +26,6 @@ tags: - level1-server - level1-workstation - - automated - patch - ldap - rule_2.3.2 @@ -43,7 +41,6 @@ tags: - level1-server - level1-workstation - - automated - patch - tftp - rule_2.3.3 @@ -59,7 +56,6 @@ tags: - level1-server - level1-workstation - - automated - patch - ftp - rule_2.3.4 diff --git a/tasks/section_4/cis_4.1.2.x.yml b/tasks/section_4/cis_4.1.2.x.yml index 2473e87..e9cee1c 100644 --- a/tasks/section_4/cis_4.1.2.x.yml +++ b/tasks/section_4/cis_4.1.2.x.yml @@ -11,7 +11,6 @@ tags: - level2-server - level2-workstation - - automated - patch - auditd - rule_4.1.2.1 diff --git a/tasks/section_4/cis_4.1.3.x.yml b/tasks/section_4/cis_4.1.3.x.yml index e29f496..922ea61 100644 --- a/tasks/section_4/cis_4.1.3.x.yml +++ b/tasks/section_4/cis_4.1.3.x.yml @@ -61,7 +61,6 @@ tags: - level2-server - level2-workstation - - automated - patch - auditd - rule_4.1.3.5 diff --git a/tasks/section_4/cis_4.2.2.x.yml b/tasks/section_4/cis_4.2.2.x.yml index c6b0e2e..e22da77 100644 --- a/tasks/section_4/cis_4.2.2.x.yml +++ b/tasks/section_4/cis_4.2.2.x.yml @@ -63,7 +63,6 @@ tags: - level1-server - level1-workstation - - automated - patch - journald - rule_4.2.2.1.4 @@ -98,7 +97,6 @@ tags: - level1-server - level1-workstation - - automated - audit - journald - rule_4.2.2.2 @@ -114,7 +112,6 @@ tags: - level1-server - level1-workstation - - automated - patch - journald - rule_4.2.2.3 @@ -130,7 +127,6 @@ tags: - level1-server - level1-workstation - - automated - patch - journald - rule_4.2.2.4 @@ -184,7 +180,7 @@ - name: "4.2.2.7 | AUDIT | Ensure journald default file permissions configured | Set live file" ansible.builtin.set_fact: systemd_conf_file: /etc/tmpfiles.d/systemd.conf - when: rhel9cis_4_2_2_7_override_stat.exists + when: rhel9cis_4_2_2_7_override.stat.exists - name: "4.2.2.7 | PATCH | Ensure journald default file permissions configured | Set permission" ansible.builtin.lineinfile: diff --git a/tasks/section_4/cis_4.2.3.yml b/tasks/section_4/cis_4.2.3.yml index a7a623a..8a7ae83 100644 --- a/tasks/section_4/cis_4.2.3.yml +++ b/tasks/section_4/cis_4.2.3.yml @@ -21,7 +21,6 @@ tags: - level1-server - level1-workstation - - automated - patch - logfiles - rule_4.2.3 diff --git a/tasks/section_6/cis_6.1.x.yml b/tasks/section_6/cis_6.1.x.yml index e8cd62f..2360ec2 100644 --- a/tasks/section_6/cis_6.1.x.yml +++ b/tasks/section_6/cis_6.1.x.yml @@ -142,7 +142,6 @@ tags: - level1-server - level1-workstation - - automated - patch - files - permissions diff --git a/tasks/warning_facts.yml b/tasks/warning_facts.yml index 37560bd..6e80487 100644 --- a/tasks/warning_facts.yml +++ b/tasks/warning_facts.yml @@ -14,7 +14,7 @@ # # warn_count the main variable for the number of warnings and each time a warn_control_id is added # the count increases by a value of 1 -- name: "NO CONTROL ID | AUDIT | Set fact for manual task warning." +- name: "{{ warn_control_id }} | AUDIT | Set fact for manual task warning." ansible.builtin.set_fact: warn_control_list: "{{ warn_control_list }} [{{ warn_control_id }}]" warn_count: "{{ warn_count | int + 1 }}"