From b970d95f1b4d3335deb430e0371a2d505ebca474 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Wed, 5 Oct 2022 14:38:39 -0400
Subject: [PATCH] Automatically join the Windows domain

---
 top.sls                | 1 +
 windows-domain.sls     | 8 ++++++++
 windowsWorkstation.sls | 3 ---
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 windows-domain.sls

diff --git a/top.sls b/top.sls
index f698c42..e849612 100644
--- a/top.sls
+++ b/top.sls
@@ -18,6 +18,7 @@ base:
   'G@os:Windows':
     - enable-wakeonlan
     - windowsWorkstation
+    - windows-domain
     - printers
     - chocolatey-packages
     - removeShortcuts
diff --git a/windows-domain.sls b/windows-domain.sls
new file mode 100644
index 0000000..cc4f8f8
--- /dev/null
+++ b/windows-domain.sls
@@ -0,0 +1,8 @@
+Join Sawtooth Domain:
+  system.join_domain:
+    - name: sawtooth.claremontmakerspace.org
+    - username: {{ salt['pillar.get']('domainjoin:user') }}
+    - password: {{ salt['pillar.get']('domainjoin:pass') }}
+
+'gpupdate':
+  cmd.run
diff --git a/windowsWorkstation.sls b/windowsWorkstation.sls
index 392df8d..ad4b5e7 100644
--- a/windowsWorkstation.sls
+++ b/windowsWorkstation.sls
@@ -15,9 +15,6 @@ windowsUpdates:
   wua.uptodate:
     - drivers: true
 
-'gpupdate':
-  cmd.run
-
 Final Housekeeping:
   powercfg.set_timeout: # Reset sleep timeout
     - name: standby