Merge pull request #40 from ansible-lockdown/v2_dec24_updates

Typos fixed

run_audit.sh

@@ -203,7 +203,7 @@ echo
 $AUDIT_BIN -g "$audit_content_dir/$AUDIT_FILE" --vars "$varfile_path"  --vars-inline "$audit_json_vars" v $format_output > "$audit_out"
 
 # create screen output
-if [ "$(grep -c test-count "$audit_out")" -ge 1 ]  || [ "$format" = junit ] || [ "$format" = tap ]; then
+if [ "$(grep -c Count: "$audit_out")" -ge 1 ]  || [ "$format" = junit ] || [ "$format" = tap ]; then
   eval $output_summary
   echo "Completed file can be found at $audit_out"
   echo "###############"

section_1/cis_1.1/cis_1.1.2.1.2.yml

@@ -0,0 +1,46 @@
+---
+
+{{ if .Vars.ubtu22cis_level_1 }}
+  {{ if .Vars.ubtu22cis_rule_1_1_2_1_2 }}
+mount:
+  tmp_options_nodev:
+    title:  1.1.2.1.2 | Ensure nodev option set on /tmp partition
+    mountpoint: /tmp
+    exists: true
+    opts:
+    - nodev
+    meta:
+      server: 1
+      workstation: 1
+      CIS_ID:
+      - 1.1.2.1.2
+      CISv8: 3.3
+      CISv8_IG1: true
+      CISv8_IG2: true
+      CISv8_IG3: true
+      NIST800-53R5:
+      - CM-7
+      - AC-3
+      - MP-2
+file:
+  tmp_fstab_nodev_options:
+     title: 1.1.2.1.2 | Ensure nodev option set on /tmp partition
+     exists: true
+     path: /etc/fstab
+     contents:
+     - '/\s\/tmp.*nodev.*/'
+     meta:
+      server: 1
+      workstation: 1
+      CIS_ID:
+      - 1.1.2.1.2
+      CISv8: 3.3
+      CISv8_IG1: true
+      CISv8_IG2: true
+      CISv8_IG3: true
+      NIST800-53R5:
+      - CM-7
+      - AC-3
+      - MP-2
+  {{ end }}
+{{ end }}

section_1/cis_1.1/cis_1.1.2.1.3.yml

@@ -0,0 +1,46 @@
+---
+
+{{ if .Vars.ubtu22cis_level_1 }}
+  {{ if .Vars.ubtu22cis_rule_1_1_2_1_3 }}
+mount:
+  tmp_nosuid_options:
+    title: 1.1.2.1.3 | Ensure nosuid option set on /tmp partition
+    mountpoint: /tmp
+    exists: true
+    opts:
+    - nosuid
+    meta:
+      server: 1
+      workstation: 1
+      CIS_ID:
+      - 1.1.2.1.3
+      CISv8: 3.3
+      CISv8_IG1: true
+      CISv8_IG2: true
+      CISv8_IG3: true
+      NIST800-53R5:
+      - CM-7
+      - AC-3
+      - MP-2
+file:
+  tmp_fstab_nosuid_options:
+     title: 1.1.2.1.3 | Ensure nosuid option set on /tmp partition
+     exists: true
+     path: /etc/fstab
+     contents:
+     - '/\s\/tmp.*nosuid.*/'
+     meta:
+      server: 1
+      workstation: 1
+      CIS_ID:
+      - 1.1.2.1.3
+      CISv8: 3.3
+      CISv8_IG1: true
+      CISv8_IG2: true
+      CISv8_IG3: true
+      NIST800-53R5:
+      - CM-7
+      - AC-3
+      - MP-2
+  {{ end }}
+{{ end }}

section_1/cis_1.1/cis_1.1.2.1.4.yml

@@ -0,0 +1,48 @@
+---
+
+{{ if .Vars.ubtu22cis_level_1 }}
+  {{ if .Vars.ubtu22cis_rule_1_1_2_1_4 }}
+mount:
+  tmp_noexec_options:
+    title: 1.1.2.1.4 | Ensure noexec option set on /tmp partition
+    mountpoint: /tmp
+    exists: true
+    opts:
+    - noexec
+    meta:
+      server: 1
+      workstation: 1
+      CIS_ID:
+      - 1.1.2.1.4
+      CISv8: 3.3
+      CISv8_IG1: true
+      CISv8_IG2: true
+      CISv8_IG3: true
+      NIST800-53R5:
+      - CM-7
+      - AC-3
+      - MP-2
+file:
+  tmp_fstab_noexec_options:
+     title: 1.1.2.1.4 | Ensure noexec option set on /tmp partition
+     exists: true
+     path: /etc/fstab
+     contents:
+     - '/\s\/tmp.*noexec.*/'
+     meta:
+      server: 1
+      workstation: 1
+      CIS_ID:
+      - 1.1.2.1.2
+      - 1.1.2.1.3
+      - 1.1.2.1.4
+      CISv8: 3.3
+      CISv8_IG1: true
+      CISv8_IG2: true
+      CISv8_IG3: true
+      NIST800-53R5:
+      - CM-7
+      - AC-3
+      - MP-2
+  {{ end }}
+{{ end }}

section_1/cis_1.1/cis_1.1.2.2.2.yml

@@ -0,0 +1,46 @@
+---
+
+{{ if .Vars.ubtu22cis_level_1 }}
+  {{ if .Vars.ubtu22cis_rule_1_1_2_2_2 }}
+mount:
+  dev_shm_nodev_options:
+    title: 1.1.2.2.2 | Ensure nodev option set on /dev/shm partition
+    mountpoint: /dev/shm
+    exists: true
+    opts:
+    - nodev
+    meta:
+      server: 1
+      workstation: 1
+      CIS_ID:
+      - 1.1.2.2.2
+      CISv8: 3.3
+      CISv8_IG1: true
+      CISv8_IG2: true
+      CISv8_IG3: true
+      NIST800-53R5:
+      - CM-7
+      - AC-3
+      - MP-2
+file:
+  dev_shm_nodev_fstab_options:
+     title: 1.1.2.2.2 | Ensure nodev option set on /dev/shm partition
+     exists: true
+     path: /etc/fstab
+     contents:
+     - '/\s\/dev\/shm.*nodev/'
+     meta:
+      server: 1
+      workstation: 1
+      CIS_ID:
+      - 1.1.2.2.2
+      CISv8: 3.3
+      CISv8_IG1: true
+      CISv8_IG2: true
+      CISv8_IG3: true
+      NIST800-53R5:
+      - CM-7
+      - AC-3
+      - MP-2
+  {{ end }}
+{{ end }}

section_1/cis_1.1/cis_1.1.2.2.3.yml

@@ -0,0 +1,46 @@
+---
+
+{{ if .Vars.ubtu22cis_level_1 }}
+  {{ if .Vars.ubtu22cis_rule_1_1_2_2_3 }}
+mount:
+  dev_shm_nosuid_options:
+    title: 1.1.2.2.3 | Ensure nosuid option set on /dev/shm partition
+    mountpoint: /dev/shm
+    exists: true
+    opts:
+    - nosuid
+    meta:
+      server: 1
+      workstation: 1
+      CIS_ID:
+      - 1.1.2.2.3
+      CISv8: 3.3
+      CISv8_IG1: true
+      CISv8_IG2: true
+      CISv8_IG3: true
+      NIST800-53R5:
+      - CM-7
+      - AC-3
+      - MP-2
+file:
+  dev_shm_nosuid_fstab_options:
+     title: 1.1.2.2.3 | Ensure nosuid option set on /dev/shm partition
+     exists: true
+     path: /etc/fstab
+     contents:
+     - '/\s\/dev\/shm.*nosuid.*/'
+     meta:
+      server: 1
+      workstation: 1
+      CIS_ID:
+      - 1.1.2.2.3
+      CISv8: 3.3
+      CISv8_IG1: true
+      CISv8_IG2: true
+      CISv8_IG3: true
+      NIST800-53R5:
+      - CM-7
+      - AC-3
+      - MP-2
+  {{ end }}
+{{ end }}