Merge pull request #224 from ansible-lockdown/issue_#222

Issue #222 and tidy up
ansible-lockdown · Sep 19, 2023 · 36bf271 · 36bf271
2 parents c682da9 + 3e03ac1
commit 36bf271
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 240 deletions.
diff --git a/.github/workflows/OS.tfvars b/.github/workflows/OS.tfvars
diff --git a/.github/workflows/github_networks.tf b/.github/workflows/github_networks.tf
diff --git a/.github/workflows/github_vars.tfvars b/.github/workflows/github_vars.tfvars
diff --git a/.github/workflows/main.tf b/.github/workflows/main.tf
diff --git a/.github/workflows/terraform.tfvars b/.github/workflows/terraform.tfvars
diff --git a/.github/workflows/variables.tf b/.github/workflows/variables.tf
diff --git a/tasks/fix-cat2.yml b/tasks/fix-cat2.yml
@@ -1843,7 +1843,7 @@
   ansible.posix.mount:
       path: /boot/efi
       state: mounted
-      src: "{{ boot_efi_mount.device }}"
+      src: "UUID={{ boot_efi_mount.uuid }}"
       fstype: "{{ boot_efi_mount.fstype }}"
       opts: "{{ boot_efi_mount.options }},nosuid"
   when:

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -187,7 +187,7 @@
   when:
       - run_audit
   tags:
-      - always
+      - run_audit
 
 - name: Show Audit Summary
   ansible.builtin.debug:
@@ -196,4 +196,3 @@
       - run_audit
   tags:
       - run_audit
-      - always
diff --git a/tasks/pre_remediation_audit.yml b/tasks/pre_remediation_audit.yml
@@ -83,7 +83,6 @@
       - run_audit
   tags:
       - goss_template
-      - always
 
 - name: "Pre Audit | Run pre_remediation {{ benchmark }} audit"
   ansible.builtin.shell: "{{ audit_conf_dir }}/run_audit.sh -v {{ audit_vars_path }} -o {{ pre_audit_outfile }} -g {{ group_names }}"