From 16b882a10e076ae47303ef66f5e0bfb0a098f183 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 20 Dec 2022 15:34:10 -0500
Subject: [PATCH] new states for kratos config and schema

---
 salt/kratos/init.sls | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/salt/kratos/init.sls b/salt/kratos/init.sls
index 3f8503390..5e411240a 100644
--- a/salt/kratos/init.sls
+++ b/salt/kratos/init.sls
@@ -43,10 +43,18 @@ kratoslogdir:
     - group: 928
     - makedirs: True
 
-kratossync:
+kratosschema:
   file.recurse:
-    - name: /opt/so/conf/kratos
-    - source: salt://kratos/files
+    - name: /opt/so/conf/kratos/schema.json
+    - source: salt://kratos/files/schema.json
+    - user: 928
+    - group: 928
+    - file_mode: 600
+
+kratosconfig:
+  file.managed:
+    - name: /opt/so/conf/kratos/kratos.yaml
+    - source: salt://kratos/files/kratos.yaml.jinja
     - user: 928
     - group: 928
     - file_mode: 600
@@ -54,14 +62,6 @@ kratossync:
     - defaults:
         GLOBALS: {{ GLOBALS }}
 
-kratos_schema:
-  file.exists:
-    - name: /opt/so/conf/kratos/schema.json
-  
-kratos_yaml:
-  file.exists:
-    - name: /opt/so/conf/kratos/kratos.yaml
-
 so-kratos:
   docker_container.running:
     - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-kratos:{{ GLOBALS.so_version }}
@@ -77,10 +77,11 @@ so-kratos:
       - 0.0.0.0:4434:4434
     - restart_policy: unless-stopped
     - watch:
-      - file: /opt/so/conf/kratos
+      - file: kratosschema
+      - file: kratosconfig
     - require:
-      - file: kratos_schema
-      - file: kratos_yaml
+      - file: kratosschema
+      - file: kratosconfig
       - file: kratoslogdir
       - file: kratosdir