Bug fixing for AWS and Server Core

Signed-off-by: fortinm <[email protected]>
ansible-lockdown · Jun 8, 2024 · cb7ae25 · cb7ae25
1 parent 13ffedd
commit cb7ae25
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -40,6 +40,9 @@ win22stig_lengthy_search: false
 # different environments. By Default This is set to false.
 win22stig_cloud_based_system: false
 
+# This will be changed to true if discovered for server core type.
+wni22stig_system_is_core: false
+
 # win_skip_for_test is used in the playbook to skip over WINRM based controls that
 # may cause WINRM Basic Connection Type to be disabled.
 # Setting win_skip_for_test to 'false' will enable Secure Connection types only.

diff --git a/tasks/cat2.yml b/tasks/cat2.yml
@@ -998,6 +998,7 @@
   notify: reboot_windows
   when:
       - wn22_00_000320
+      - not win22stig_is_server_core
   tags:
       - WN22-00-000320
       - CAT2
@@ -1070,6 +1071,7 @@
       state: absent
   when:
       - wn22_00_000370
+      - not win22stig_is_server_core
   tags:
       - WN22-00-000370
       - CAT2

diff --git a/tasks/prelim.yml b/tasks/prelim.yml
@@ -16,6 +16,7 @@
   ansible.builtin.set_fact:
       win22stig_cloud_based_system: true
   when:
+      - ansible_system_vendor == 'Microsoft Corporation'
       - ansible_virtualization_type == 'Hyper-V' or
         ansible_virtualization_type == 'hvm' or
         ansible_virtualization_type == 'kvm'
@@ -60,3 +61,10 @@
   when:
       - wn22_00_000390 or
         wn22_00_000400
+
+- name: Set Fact If Server Core installation
+  ansible.builtin.set_fact:
+      win22stig_is_server_core: true
+  when: ansible_os_installation_type == 'Server Core'
+  tags:
+      - always