Update Section 1 Logic

Signed-off-by: Stephen Williams <[email protected]>
ansible-lockdown · Mar 14, 2024 · cd80e49 · cd80e49
1 parent 401590c
commit cd80e49
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -682,7 +682,6 @@ win19cis_public_firewall_log_size: 16384
 
 # Section 18 Variables
 
-
 # 18.3.5
 # win19cis_laps_password_length is the LAPS tool password length.
 # The recommended state for this setting is: Enabled: 15 or more.

diff --git a/tasks/section01.yml b/tasks/section01.yml
@@ -178,8 +178,6 @@
       file: section01_cloud_lockout_order.yml
   when:
       - win19cis_cloud_based_system or
-        win2019cis_is_domain_controller or
-        win2019cis_is_domain_member
   tags:
       - section01_cloud_lockout_order
 
@@ -254,9 +252,7 @@
             - win19cis_account_lockout_counter_reset <= win19cis_account_lockout_duration
   when:
       - win19cis_rule_1_2_4
-      - not win19cis_cloud_based_system or
-        win2019cis_is_domain_controller or
-        win2019cis_is_domain_member
+      - not win19cis_cloud_based_system
   tags:
       - level1-domaincontroller
       - level1-memberserver
@@ -288,9 +284,7 @@
         when: win19cis_account_lockout_duration >= 15
   when:
       - win19cis_rule_1_2_1
-      - not win19cis_cloud_based_system or
-        win2019cis_is_domain_controller or
-        win2019cis_is_domain_member
+      - not win19cis_cloud_based_system
   tags:
       - level1-domaincontroller
       - level1-memberserver

diff --git a/tasks/section01_cloud_lockout_order.yml b/tasks/section01_cloud_lockout_order.yml
@@ -80,6 +80,7 @@
       value: "{{ win19cis_allow_admin_account_lockout }}"
   when:
       - win19cis_rule_1_2_3
+      - win2019cis_is_domain_member
   tags:
       - level1-memberserver
       - rule_1.2.3