updated

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

tasks/section_2/cis_2.3.x.yml

@@ -1,43 +1,97 @@
 ---
 
-- name: "2.3.1 | L1 | PATCH | Ensure NIS Client is not installed"
+- name: "2.3.1 | PATCH | Ensure NIS Client is not installed"
   package:
       name: ypbind
       state: absent
   when:
-      - not rhel9cis_ypbind_required
+      - not rhel8cis_ypbind_required
       - "'ypbind' in ansible_facts.packages"
-      - rhel9cis_rule_2_3_1
+      - rhel8cis_rule_2_3_1
   tags:
       - level1-server
       - level1-workstation
+      - automated
       - patch
+      - nis
       - rule_2.3.1
 
-- name: "2.3.2 | L1 | PATCH | Ensure telnet client is not installed"
+- name: "2.3.2 | PATCH | Ensure rsh client is not installed"
+  package:
+      name: rsh
+      state: absent
+  when:
+      - not rhel8cis_rsh_required
+      - "'rsh' in ansible_facts.packages"
+      - rhel8cis_rule_2_3_2
+  tags:
+      - level1-server
+      - level2-server
+      - automated
+      - patch
+      - rsh
+      - rule_2.3.2
+
+- name:  "2.3.3 | PATCH | Ensure talk client is not installed"
+  package:
+      name: talk
+      state: absent
+  when:
+      - not rhel8cis_talk_required
+      - "'talk' in ansible_facts.packages"
+      - rhel8cis_rule_2_3_3
+  tags:
+      - level1-server
+      - level1-workstation
+      - automated
+      - patch
+      - talk
+      - rule_2.3.3
+
+- name: "2.3.4 | PATCH | Ensure telnet client is not installed"
   package:
       name: telnet
       state: absent
   when:
-      - not rhel9cis_telnet_required
+      - not rhel8cis_telnet_required
       - "'telnet' in ansible_facts.packages"
-      - rhel9cis_rule_2_3_2
+      - rhel8cis_rule_2_3_4
   tags:
       - level1-server
       - level1-workstation
+      - automated
       - patch
-      - rule_2.3.2
+      - telnet
+      - rule_2.3.4
 
-- name: "2.3.3 | L1 | PATCH | Ensure LDAP client is not installed"
+- name: "2.3.5 | PATCH | Ensure LDAP client is not installed"
   package:
       name: openldap-clients
       state: absent
   when:
-      - not rhel9cis_openldap_clients_required
+      - not rhel8cis_openldap_clients_required
       - "'openldap-clients' in ansible_facts.packages"
-      - rhel9cis_rule_2_3_3
+      - rhel8cis_rule_2_3_5
   tags:
       - level1-server
       - level1-workstation
+      - automated
       - patch
-      - rule_2.3.3
+      - ldap
+      - rule_2.3.5
+
+- name: "2.3.6 | PATCH | Ensure TFTP client is not installed"
+  package:
+      name: tftp
+      state: absent
+  when:
+      - not rhel8cis_tftp_client
+      - "'tftp' in ansible_facts.packages"
+      - rhel8cis_rule_2_3_6
+  tags:
+      - level1-server
+      - level1-workstation
+      - automated
+      - patch
+      - tftp
+      - rule_2.3.6