From 274ba288d980e93651628ec45a0dca98a5f88b64 Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Date: Apr 13 2024 13:17:28 +0000
Subject: Consolidate Kanidm files + require packages


- Add a requirement on the package installation to the files to
  avoid "parent directory not present" errors when applying the
  state on new minions
- Consolidate the file states to reduce existing and avoid additional
  redundant code

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

---

diff --git a/salt/profile/kanidm/client/init.sls b/salt/profile/kanidm/client/init.sls
index 12075f6..faee233 100644
--- a/salt/profile/kanidm/client/init.sls
+++ b/salt/profile/kanidm/client/init.sls
@@ -10,45 +10,26 @@ include:
     - repl: '{{ setting }}: compat kanidm'
 {%- endfor %}
 
-/etc/kanidm/config:
+kanidm_config:
   file.managed:
-    - template: jinja
-    - source: salt://profile/kanidm/client/files/etc/kanidm/config
-    - mode: '0644'
-
-/etc/kanidm/unixd:
-  file.managed:
-    - template: jinja
-    - source: salt://profile/kanidm/client/files/etc/kanidm/unixd
-    - mode: '0644'
-
-/etc/pam.d/common-account:
-  file.managed:
-    - template: jinja
-    - source: salt://profile/kanidm/client/files/etc/pam.d/common-account
-    - mode: '0644'
+    - names:
+        - /etc/kanidm/config:
+            - source: salt://profile/kanidm/client/files/etc/kanidm/config
+        - /etc/kanidm/unixd:
+            - source: salt://profile/kanidm/client/files/etc/kanidm/unixd
+        - /etc/pam.d/common-account:
+            - source: salt://profile/kanidm/client/files/etc/pam.d/common-account
+        - /etc/pam.d/common-auth:
+            - source: salt://profile/kanidm/client/files/etc/pam.d/common-auth
+        - /etc/pam.d/common-session:
+            - source: salt://profile/kanidm/client/files/etc/pam.d/common-session
+        - /etc/pam.d/common-password:
+            - source: salt://profile/kanidm/client/files/etc/pam.d/common-password
     - follow_symlinks: False
-
-/etc/pam.d/common-auth:
-  file.managed:
-    - template: jinja
-    - source: salt://profile/kanidm/client/files/etc/pam.d/common-auth
     - mode: '0644'
-    - follow_symlinks: False
-
-/etc/pam.d/common-session:
-  file.managed:
-    - template: jinja
-    - source: salt://profile/kanidm/client/files/etc/pam.d/common-session
-    - mode: '0644'
-    - follow_symlinks: False
-
-/etc/pam.d/common-password:
-  file.managed:
     - template: jinja
-    - source: salt://profile/kanidm/client/files/etc/pam.d/common-password
-    - mode: '0644'
-    - follow_symlinks: False
+    - require:
+        - pkg: zypper_packages
 
 kanidm-unixd.service:
   service.running: