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

Updated 2.2

section_2/cis_2.2/cis_2.2.4.yml

@@ -5,8 +5,25 @@
     {{ if .Vars.ubtu24cis_rule_2_2_4 }}
 package:
   telnet:
-    title: 2.2.4 | Ensure telnet client is not installed
+    title: 2.2.4 | Ensure telnet client is not installed | telnet
     installed: false
+    name: telnet
+    meta:
+      server: 1
+      workstation: 1
+      CIS_ID: 2.2.4
+      CISv8:
+      - 4.8
+      CISv8_IG1: false
+      CISv8_IG2: true
+      CISv8_IG3: true
+      NIST800-53R5:
+      - CM-7
+      - CM-11
+  inetutils-telnet:
+    title: 2.2.4 | Ensure telnet client is not installed | inetutils-telnet
+    installed: false
+    name: inetutils-telnet
     meta:
       server: 1
       workstation: 1

section_2/cis_2.2/cis_2.2.6.yml

@@ -20,6 +20,22 @@ package:
       NIST800-53R5:
       - CM-7
       - CM-11
+  tnftp_client:
+    title: 2.2.6 | Ensure ftp client is not installed | tnftp
+    installed: false
+    name: tnftp
+    meta:
+      server: 1
+      workstation: 1
+      CIS_ID: 2.2.6
+      CISv8:
+      - 4.8
+      CISv8_IG1: false
+      CISv8_IG2: true
+      CISv8_IG3: true
+      NIST800-53R5:
+      - CM-7
+      - CM-11
     {{ end }}
   {{ end }}
 {{ end }}