updated tags

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

tasks/main.yml

@@ -108,9 +108,12 @@
 
 - name: capture /etc/password variables
   include_tasks: parse_etc_password.yml
-  when: rhel9cis_section6
+  when: 
+  - rhel9cis_section6
   tags:
   - rule_5.5.2
+  - rule_6.2.7
+  - rule_6.2.20
   - rhel9cis_section6
 
 - name: run Section 1 tasks

tasks/section_1/main.yml

@@ -2,41 +2,41 @@
 
 - name: "SECTION | 1.1 | FileSystem Configurations\n
          SECTION | 1.1.1.x | Disable unused filesystems"
-  include_tasks: cis_1.1.1.x.yml
+  import_tasks: cis_1.1.1.x.yml
-- include_tasks: cis_1.1.x.yml
+- import_tasks: cis_1.1.x.yml
 
 - name: "SECTION | 1.2 | Configure Software Updates"
-  include_tasks: cis_1.2.x.yml
+  import_tasks: cis_1.2.x.yml
 
 - name: "SECTION | 1.3 | Configure sudo"
-  include_tasks: cis_1.3.x.yml
+  import_tasks: cis_1.3.x.yml
 
 - name: "SECTION | 1.4 | Filesystem Integrity"
-  import_tasks: cis_1.4.x.yml
+  include_tasks: cis_1.4.x.yml
   when: rhel9cis_config_aide
 
 - name: "SECTION | 1.5 | Secure Boot Settings"
-  include_tasks: cis_1.5.x.yml
+  import_tasks: cis_1.5.x.yml
 
 - name: "SECTION | 1.6 | Additional Process Hardening"
-  include_tasks: cis_1.6.x.yml
+  import_tasks: cis_1.6.x.yml
 
 - name: "SECTION | 1.7 | bootloader and Mandatory Access Control"
-  import_tasks: cis_1.7.1.x.yml
+  include_tasks: cis_1.7.1.x.yml
   when: not rhel9cis_selinux_disable
 
 - name: "SECTION | 1.8 | Warning Banners"
-  include_tasks: cis_1.8.1.x.yml
+  import_tasks: cis_1.8.1.x.yml
 
 - name: "SECTION | 1.9 | Updated and Patches"
-  include_tasks: cis_1.9.yml
+  import_tasks: cis_1.9.yml
 
 - name: "SECTION | 1.10 | Crypto policies"
-  import_tasks: cis_1.10.yml
+  include_tasks: cis_1.10.yml
   when:
   - not system_is_ec2
 
 - name: "SECTION | 1.11 | FIPS/FUTURE Crypto policies"
-  import_tasks: cis_1.11.yml
+  include_tasks: cis_1.11.yml
   when:
   - not system_is_ec2

tasks/section_2/main.yml

@@ -1,13 +1,13 @@
 ---
 
 - name: "SECTION | 2.1 | xinetd"
-  include_tasks: cis_2.1.1.yml
+  import_tasks: cis_2.1.1.yml
 
 - name: "SECTION | 2.2.1 | Time Synchronization"
-  include_tasks: cis_2.2.1.x.yml
+  import_tasks: cis_2.2.1.x.yml
 
 - name: "SECTION | 2.2 | Special Purpose Services"
-  include_tasks: cis_2.2.x.yml
+  import_tasks: cis_2.2.x.yml
 
 - name: "SECTION | 2.3 | Service Clients"
-  include_tasks: cis_2.3.x.yml
+  import_tasks: cis_2.3.x.yml

tasks/section_3/main.yml

@@ -1,41 +1,41 @@
 ---
 
 - name: "SECTION | 3.1.x | Packet and IP redirection"
-  include_tasks: cis_3.1.x.yml
+  import_tasks: cis_3.1.x.yml
 
 - name: "SECTION | 3.2.x | Network Parameters (Host Only)"
-  include_tasks: cis_3.2.x.yml
+  import_tasks: cis_3.2.x.yml
 
 - name: "SECTION | 3.3.x | Uncommon Network Protocols"
-  include_tasks: cis_3.3.x.yml
+  import_tasks: cis_3.3.x.yml
 
 - name: "SECTION | 3.4.1.x | firewall defined"
-  include_tasks: cis_3.4.1.1.yml
+  import_tasks: cis_3.4.1.1.yml
 
 - name: "SECTION | 3.4.2.x | firewalld firewall"
-  import_tasks: cis_3.4.2.x.yml
+  include_tasks: cis_3.4.2.x.yml
   when:
   - rhel9cis_firewall == "firewalld"
 
 - name: "SECTION | 3.4.3.x | Configure nftables firewall"
-  import_tasks: cis_3.4.3.x.yml
+  include_tasks: cis_3.4.3.x.yml
   when:
   - rhel9cis_firewall == "nftables"
 
 - name: "SECTION | 3.4.4.1.x | Configure iptables IPv4"
-  import_tasks: cis_3.4.4.1.x.yml
+  include_tasks: cis_3.4.4.1.x.yml
   when:
   - rhel9cis_firewall == "iptables"
 
 - name: "SECTION | 3.4.4.2.x | Configure iptables IPv6"
-  import_tasks: cis_3.4.4.2.x.yml
+  include_tasks: cis_3.4.4.2.x.yml
   when:
   - ( rhel9cis_firewall == "iptables" and rhel9cis_ipv6_required )
 
 - name: "SECTION | 3.5 | Configure wireless"
-  include_tasks: cis_3.5.yml
+  import_tasks: cis_3.5.yml
 
 - name: "SECTION | 3.5 | disable IPv6"
-  import_tasks: cis_3.5.yml
+  include_tasks: cis_3.5.yml
   when:
   - not rhel9cis_ipv6_required

tasks/section_4/main.yml

@@ -6,20 +6,20 @@
       - not system_is_container
 
 - name: "SECTION | 4.1.2.x| Configure Data Retention"
-  include_tasks: cis_4.1.2.x.yml
+  import_tasks: cis_4.1.2.x.yml
 
 - name: "SECTION | 4.1.x| Auditd rules"
-  include_tasks: cis_4.1.x.yml
+  import_tasks: cis_4.1.x.yml
 
 - name: "SECTION | 4.2.x| Configure Logging"
   import_tasks: cis_4.2.1.x.yml
   when: rhel9cis_syslog == 'rsyslog'
 
 - name: "SECTION | 4.2.2.x| Configure journald"
-  include_tasks: cis_4.2.2.x.yml
+  import_tasks: cis_4.2.2.x.yml
 
 - name: "SECTION | 4.2.3 | Configure logile perms"
-  include_tasks: cis_4.2.3.yml
+  import_tasks: cis_4.2.3.yml
 
 - name: "SECTION | 4.3 | Configure logrotate"
-  include_tasks: cis_4.3.yml
+  import_tasks: cis_4.3.yml

tasks/section_6/main.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: "SECTION | 6.1 | System File Permissions"
-  include_tasks: cis_6.1.x.yml
+  import_tasks: cis_6.1.x.yml
 
 - name: "SECTION | 6.2 | User and Group Settings"
-  include_tasks: cis_6.2.x.yml
+  import_tasks: cis_6.2.x.yml