Merge pull request #24 from ccdc-opensource/general-fixes-and-improvements

General fixes and improvements

Author: layfield-ccdc

defaults/main.yml

@@ -1,4 +1,6 @@
 ---
+# Generic info
+use_become: true
 # Disable Telemetry
 disable_telemetry_policy: true
 disable_telemetry_dnsblock: true

tasks/disable_services.yml

@@ -10,4 +10,4 @@
     state: stopped
     start_mode: disabled
   when: service_info.exists
-  become: true
+  become: "{{ use_become | default(true) }}"

tasks/main.yml

@@ -1,26 +1,33 @@
 ---
 - name: Disable telemetry
   ansible.builtin.include_tasks: disable_telemetry.yml
-
+  tags: telemetry
 # We need to call this role in a loop externally as otherwise it will fail for
 # any services that happen not to exist on the target system
 - name: Disable unnecessary services
   ansible.builtin.include_tasks: disable_services.yml
   vars:
     service: "{{ item }}"
   with_items: "{{ disable_services }}"
-
+  tags: disable_services
 - name: Disable Windows Defender
   ansible.builtin.include_tasks: disable_windows_defender.yml
+  tags: defender
 - name: Privacy hardening
   ansible.builtin.include_tasks: setup_privacy.yml
+  tags: privacy
 - name: UI setup
   ansible.builtin.include_tasks: setup_ui.yml
+  tags: ui
 - name: Set up Windows Update
   ansible.builtin.include_tasks: setup_windows_update.yml
+  tags: updates
 - name: Remove default apps
   ansible.builtin.include_tasks: remove_default_apps.yml
+  tags: default_apps
 - name: Remove OneDrive
   ansible.builtin.include_tasks: remove_onedrive.yml
+  tags: onedrive
 - name: Disable Hibernation
   ansible.builtin.include_tasks: disable_hibernation.yml
+  tags: hibernation

tasks/remove_onedrive.yml

@@ -4,6 +4,7 @@
   ansible.windows.win_shell: |
     Stop-Process -Name "OneDrive" -Force
     Stop-Process -Name "explorer" -Force
+  ignore_errors: true
 
 - name: Find OneDrive installer
   when: remove_onedrive

tasks/setup_privacy.yml

@@ -1,8 +1,9 @@
 ---
-
 - name: "Disable Windows Search web results"
   when: disable_search_web_results
-  ansible.windows.win_shell: Set-WindowsSearchSetting -EnableWebResultsSetting $false
+  ansible.windows.win_powershell:
+    script: |
+      Set-WindowsSearchSetting -EnableWebResultsSetting $false
 
 - name: Disable web language list access
   when: disable_web_language_list_access