Merge pull request #18 from p3ck/main-fixes

Minor fixes

extensions/patterns/manage_service/setup.yml

@@ -39,7 +39,7 @@ controller_templates:
       - infra.windows_ops
       - manage_service_pattern
       - run_manage_service
-    playbook: "extensions/patterns/manage_service/playbooks/run_manage_service.yml' }}"
+    playbook: "extensions/patterns/manage_service/playbooks/run_manage_service.yml"
     project: Windows Operations / Project
     survey_enabled: true
     survey_spec: "{{ lookup('file', pattern.path.replace('setup.yml', '') + 'template_surveys/manage_service.yml') | from_yaml }}"

extensions/patterns/manage_service/template_surveys/manage_services.yml

@@ -24,7 +24,7 @@ spec:
     question_description: "Set the startup mode for the Service"
     required: false
     variable: "service_start_mode"
-    type: "multplechoice"
+    type: "multiplechoice"
     choices:
       - "auto"
       - "delayed"

extensions/patterns/manage_updates/setup.yml

@@ -39,7 +39,7 @@ controller_templates:
       - infra.windows_ops
       - manage_updates_pattern
       - run_manage_updates
-    playbook: "extensions/patterns/manage_updates/playbooks/run_manage_updates.yml' }}"
+    playbook: "extensions/patterns/manage_updates/playbooks/run_manage_updates.yml"
     project: Windows Operations / Project
     survey_enabled: true
     survey_spec: "{{ lookup('file', pattern.path.replace('setup.yml', '') + 'template_surveys/manage_updates.yml') | from_yaml }}"

extensions/patterns/manage_updates/template_surveys/manage_updates.yml

@@ -18,9 +18,8 @@ spec:
       - "Tools"
       - "UpdateRollups"
       - "Updates"
-    default:
-      - "CriticalUpdates"
-      - "SecurityUpdates"
+    default: "CriticalUpdates\nSecurityUpdates"
+    required: true
 
   - type: "multiplechoice"
     question_name: "Reboot after install?"
@@ -29,7 +28,8 @@ spec:
     choices:
       - "Yes"
       - "No"
-    default: Yes
+    default: "Yes"
+    required: false
 
   - type: "multiplechoice"
     question_name: "Install updates, download or just search for updates?"
@@ -40,3 +40,4 @@ spec:
       - "searched"
       - "downloaded"
     default: "searched"
+    required: true

roles/windows_manage_iis/tasks/create.yml

@@ -13,7 +13,6 @@
 
 - name: Reboot when Web-Server feature requires it
   ansible.windows.win_reboot:
-    test_command: '(Get-Service -Name Netlogon).Status -ne "Running"'
   when: windows_manage_iis_output.reboot_required
 
 - name: Create site directory structure
@@ -26,10 +25,17 @@
   ansible.builtin.set_fact:
     windows_manage_iis_results: "{{ windows_manage_iis_results | default({}) | combine({'win_file': windows_manage_iis_output}) }}"
 
-- name: Delete Default Site
+- name: Check for existing site
+  ansible.windows.win_powershell:
+    script: |
+      Get-Website
+  register: powershell_result
+
+- name: Delete existing Site
   community.windows.win_iis_website:
-    name: "Default Web Site"
+    name: "{{ item.name }}"
     state: absent
+  loop: "{{ powershell_result.output }}"
 
 - name: Create IIS site
   community.windows.win_iis_website:

roles/windows_manage_updates/tasks/main.yml

@@ -20,7 +20,6 @@
 
   - name: Reboot when required and requested
     ansible.windows.win_reboot:
-      test_command: '(Get-Service -Name Netlogon).Status -ne "Running"'
     when:
       - windows_manage_updates_output.reboot_required
       - windows_manage_updates_reboot_server