From eb580faf0aa208e9df80b3c81f654d53bbf2cdba Mon Sep 17 00:00:00 2001
From: Erik Kristensen <erik@erikkristensen.com>
Date: Sun, 29 Oct 2017 09:37:17 -0600
Subject: [PATCH] fixing file permissions on keydat tools, fixing foremost
 config, finally!

---
 sift/config/init.sls                        | 2 ++
 sift/{scripts => config/tools}/foremost.sls | 8 ++++++++
 sift/config/tools/init.sls                  | 8 ++++++++
 sift/scripts/keydet-tools.sls               | 2 +-
 4 files changed, 19 insertions(+), 1 deletion(-)
 rename sift/{scripts => config/tools}/foremost.sls (68%)
 create mode 100644 sift/config/tools/init.sls

diff --git a/sift/config/init.sls b/sift/config/init.sls
index 0081846..b263f48 100644
--- a/sift/config/init.sls
+++ b/sift/config/init.sls
@@ -5,6 +5,7 @@ include:
   - sift.config.folders
   - sift.config.salt-minion
   - sift.config.samba
+  - sift.config.tools
   #- .symlinks
 
 sift-config:
@@ -17,4 +18,5 @@ sift-config:
       - sls: sift.config.folders
       - sls: sift.config.salt-minion
       - sls: sift.config.samba
+      - sls: sift.config.tools
       
diff --git a/sift/scripts/foremost.sls b/sift/config/tools/foremost.sls
similarity index 68%
rename from sift/scripts/foremost.sls
rename to sift/config/tools/foremost.sls
index bf02d61..b664855 100644
--- a/sift/scripts/foremost.sls
+++ b/sift/config/tools/foremost.sls
@@ -1,9 +1,17 @@
+include:
+  - sift.packages.foremost
+
 sift-scripts-foremost-config:
   file.managed:
     - name: /etc/foremost.conf
     - source: salt://sift/files/foremost/foremost.conf
+    - required:
+      - pkg: foremost
 
 sift-scripts-foremost-config-usr-local:
   file.managed:
     - name: /usr/local/etc/foremost.conf
     - source: salt://sift/files/foremost/foremost.conf
+    - makedirs: True
+    - required:
+      - pkg: foremost
diff --git a/sift/config/tools/init.sls b/sift/config/tools/init.sls
new file mode 100644
index 0000000..174963a
--- /dev/null
+++ b/sift/config/tools/init.sls
@@ -0,0 +1,8 @@
+include:
+  - sift.config.tools.foremost
+  
+sift-config-tools:
+  test.nop:
+    - name: sift-config-tools
+    - require:
+      - sls: sift.config.tools.foremost
diff --git a/sift/scripts/keydet-tools.sls b/sift/scripts/keydet-tools.sls
index a965112..1b7ad81 100644
--- a/sift/scripts/keydet-tools.sls
+++ b/sift/scripts/keydet-tools.sls
@@ -18,7 +18,7 @@ sift-scripts-keydet-tools-{{ file }}:
     - name: /usr/local/bin/{{ file }}
     - source: /usr/local/src/keydet-tools/source/{{ file }}
     - mode: 755
-    - watch:
+    - require:
       - git: sift-scripts-keydet-tools-git
 
 sift-scripts-keydet-tools-shebang-{{ file }}: