From dd57dec713671e02e6144e45cf8186dd4bc46d18 Mon Sep 17 00:00:00 2001
From: willtome <willtome@gmail.com>
Date: Mon, 12 Sep 2022 15:21:35 -0400
Subject: [PATCH] update AD jobs

---
 .../create_ad_domain.yml                      |   4 +-
 .../helpdesk_new_user_portal.yml              |   0
 windows/setup.yml                             | 128 +++++++++---------
 3 files changed, 66 insertions(+), 66 deletions(-)
 rename windows/{active_directory => }/create_ad_domain.yml (82%)
 rename windows/{active_directory => }/helpdesk_new_user_portal.yml (100%)

diff --git a/windows/active_directory/create_ad_domain.yml b/windows/create_ad_domain.yml
similarity index 82%
rename from windows/active_directory/create_ad_domain.yml
rename to windows/create_ad_domain.yml
index 00ee7d2..2fee352 100644
--- a/windows/active_directory/create_ad_domain.yml
+++ b/windows/create_ad_domain.yml
@@ -7,7 +7,7 @@
   - name: Create new domain in a new forest on the target host
     ansible.windows.win_domain:
       dns_domain_name: ansible.local
-      safe_mode_password: "{{ lookup('community.general.random_string', min_lower=1, min_upper=1, min_special=1, min_numeric=1) }}"
+      safe_mode_password: "{{ ansible_password }}"
     register: new_forest
 
   - name: Reboot the target host
@@ -36,7 +36,7 @@
     community.windows.win_domain_user:
       name: "{{ item.name }}"
       groups: "{{ item.groups }}"
-      password: "{{ lookup('community.general.random_string', min_lower=1, min_upper=1, min_special=1, min_numeric=1) }}"
+      password: "{{ ansible_password }}"
       update_password: on_create
     loop:
       - { name: "UserA", groups: "GroupA" }
diff --git a/windows/active_directory/helpdesk_new_user_portal.yml b/windows/helpdesk_new_user_portal.yml
similarity index 100%
rename from windows/active_directory/helpdesk_new_user_portal.yml
rename to windows/helpdesk_new_user_portal.yml
diff --git a/windows/setup.yml b/windows/setup.yml
index e9acff4..cddec4c 100644
--- a/windows/setup.yml
+++ b/windows/setup.yml
@@ -208,68 +208,68 @@ controller_templates:
           variable: HOSTS
           required: false
 
-#  - name: "ACTIVE DIRECTORY / Create Active Directory domain"
-#    job_type: run
-#    inventory: "Workshop Inventory"
-#    project: "Ansible official demo project"
-#    playbook: "windows/active_directory/create_ad_domain.yml"
-#    execution_environment: Default execution environment
-#    notification_templates_started: Telemetry
-#    notification_templates_success: Telemetry
-#    notification_templates_error: Telemetry
-#    credentials:
-#    - "Workshop Credential"
-#    survey_enabled: true
-#    survey:
-#      name: ''
-#      description: ''
-#      spec:
-#        - question_name: Server Name or Pattern
-#          type: text
-#          variable: HOSTS
-#          required: false
+  - name: "WINDOWS / AD /Create Domain"
+    job_type: run
+    inventory: "Workshop Inventory"
+    project: "Ansible official demo project"
+    playbook: "windows/create_ad_domain.yml"
+    execution_environment: Default execution environment
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    credentials:
+    - "Workshop Credential"
+    survey_enabled: true
+    survey:
+      name: ''
+      description: ''
+      spec:
+        - question_name: Server Name or Pattern
+          type: text
+          variable: HOSTS
+          required: false
 
-#  - name: "ACTIVE DIRECTORY / Helpdesk new user portal"
-#    job_type: run
-#    inventory: "Workshop Inventory"
-#    project: "Ansible official demo project"
-#    playbook: "windows/active_directory/helpdesk_new_user_portal.yml"
-#    execution_environment: Default execution environment
-#    notification_templates_started: Telemetry
-#    notification_templates_success: Telemetry
-#    notification_templates_error: Telemetry
-#    credentials:
-#    - "Workshop Credential"
-#    survey_enabled: true
-#    survey:
-#      name: ''
-#      description: ''
-#      spec:
-#        - question_name: Firstname
-#          type: text
-#          variable: firstname
-#          required: true
-#        - question_name: Surname
-#          type: text
-#          variable: surname
-#          required: true
-#        - question_name: Street
-#          type: text
-#          variable: street
-#          default: 123 4th St.
-#          required: false
-#        - question_name: City
-#          type: text
-#          variable: city
-#          default: Sometown
-#          required: false
-#        - question_name: Postal code
-#          type: text
-#          variable: postal_code
-#          default: IN
-#          required: false
-#        - question_name: Telephone number
-#          type: text
-#          variable: telephone_number
-#          default: 555-123456
-#          required: false
+  - name: "WINDOWS / AD / New User"
+    job_type: run
+    inventory: "Workshop Inventory"
+    project: "Ansible official demo project"
+    playbook: "windows/helpdesk_new_user_portal.yml"
+    execution_environment: Default execution environment
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    credentials:
+    - "Workshop Credential"
+    survey_enabled: true
+    survey:
+      name: ''
+      description: ''
+      spec:
+        - question_name: Firstname
+          type: text
+          variable: firstname
+          required: true
+        - question_name: Surname
+          type: text
+          variable: surname
+          required: true
+        - question_name: Street
+          type: text
+          variable: street
+          default: 123 4th St.
+          required: false
+        - question_name: City
+          type: text
+          variable: city
+          default: Sometown
+          required: false
+        - question_name: Postal code
+          type: text
+          variable: postal_code
+          default: IN
+          required: false
+        - question_name: Telephone number
+          type: text
+          variable: telephone_number
+          default: 555-123456
+          required: false