From 92334f5aa1a1e7108e3ec6d2b4edae9def763ab3 Mon Sep 17 00:00:00 2001
From: Terry Derks <terry@keiran.us>
Date: Fri, 22 Dec 2023 14:46:35 -0500
Subject: [PATCH] split smb into a subformula

---
 samba/init.sls | 29 ++---------------------------
 samba/smbd.sls | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 27 deletions(-)
 create mode 100644 samba/smbd.sls

diff --git a/samba/init.sls b/samba/init.sls
index f39efaf..69c87ea 100644
--- a/samba/init.sls
+++ b/samba/init.sls
@@ -1,29 +1,4 @@
-samba_packages:
-  pkg.installed:
-    - pkgs:
-      - samba
-      - samba-common-bin
-
-smbd:
-  service.running:
-    - enable: True
-    - watch:
-      - file: /etc/samba/smb.conf
-      - pkg: samba_packages
-
-/etc/samba/smb.conf:
-  file.managed:
-    - source: 'salt://samba/files/smb.conf.jinja'
-    - template: jinja
-
-{# generate these with print(hashlib.new('md4', "password".encode('utf-16le')).hexdigest()) #}
-{% for user, passw in salt.pillar.get('samba:users', {}).items() %}
-samba_{{user}}:
-  pdbedit.managed:
-    - name: {{user}}
-    - password: {{passw}}
-    - password_hashed: True
-{% endfor %}
-
 include:
+  - samba.smbd
   - samba.wsdd
+
diff --git a/samba/smbd.sls b/samba/smbd.sls
new file mode 100644
index 0000000..0ad7101
--- /dev/null
+++ b/samba/smbd.sls
@@ -0,0 +1,27 @@
+samba_packages:
+  pkg.installed:
+    - pkgs:
+      - samba
+      - samba-common-bin
+
+smbd:
+  service.running:
+    - enable: True
+    - watch:
+      - file: /etc/samba/smb.conf
+      - pkg: samba_packages
+
+/etc/samba/smb.conf:
+  file.managed:
+    - source: 'salt://samba/files/smb.conf.jinja'
+    - template: jinja
+    - check_cmd: /usr/bin/testparm -d 0 -s
+
+{# generate these with print(hashlib.new('md4', "password".encode('utf-16le')).hexdigest()) #}
+{% for user, passw in salt.pillar.get('samba:users', {}).items() %}
+samba_{{user}}:
+  pdbedit.managed:
+    - name: {{user}}
+    - password: {{passw}}
+    - password_hashed: True
+{% endfor %}