Merge pull request #3 from ansible-lockdown/2.2_control_updates

2.2 control updates

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

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

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 }}"