From 930cd81b4d6104d0582b29c573a3e3d3a69bc9a7 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Wed, 21 Feb 2018 12:36:53 -0500
Subject: [PATCH] PCAP Salt Module - Clean up directory creations

---
 salt/pcap/files/config |  2 +-
 salt/pcap/init.sls     | 25 ++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/salt/pcap/files/config b/salt/pcap/files/config
index 9959efd37..0394093e9 100644
--- a/salt/pcap/files/config
+++ b/salt/pcap/files/config
@@ -7,7 +7,7 @@
     }
   ]
   , "StenotypePath": "/usr/bin/stenotype"
-  , "Interface": "em1"
+  , "Interface": "{{ interface }}"
   , "Port": 1234
   , "Host": "127.0.0.1"
   , "Flags": []
diff --git a/salt/pcap/init.sls b/salt/pcap/init.sls
index 8027da430..c9c477f07 100644
--- a/salt/pcap/init.sls
+++ b/salt/pcap/init.sls
@@ -22,17 +22,36 @@ stenoconfdir:
     - group: 939
     - makedirs: True
 
+stenoconf:
+  file.managed:
+    - name: /opt/so/conf/steno/config
+    - source: salt://pcap/files/config
+    - user: 941
+    - group: 939
+    - template: jinja
+
 pcapdir:
   file.directory:
     - name: /nsm/pcap
+    - user: 941
+    - group: 939
+    - makedirs: True
 
 pcapindexdir:
   file.directory:
     - name: /nsm/pcapindex
+    - user: 941
+    - group: 939
+    - makedirs: True
 
 so-steno:
   dockerng.running:
-    - image: pillaritem/so-steno
+    - image: toosmooth/so-steno:test2
     - network_mode: host
-    - /opt/so/conf/stenographer/certs:/etc/stenographer/certs:rw
-    - /opt/so/conf/stenographer/config:/etc/stenographer/config:ro
+    - user: 941
+    - priviledged: true
+    - binds:
+      - /opt/so/conf/stenographer/certs:/etc/stenographer/certs:rw
+      - /opt/so/conf/stenographer/config:/etc/stenographer/config:ro
+      - /nsm/pcap:/nsm/pcap:rw
+      - /nsm/pcapindex:/nsm/pcapindex:rw