From 61d681eb65ae5b356c68b4200eca0c35f3a06d56 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Wed, 12 Jun 2019 14:29:47 -0400
Subject: [PATCH] Sensoroni Module - Add watch statement and recreate docker

---
 salt/sensoroni/files/sensoroni.json | 6 +++---
 salt/sensoroni/init.sls             | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/salt/sensoroni/files/sensoroni.json b/salt/sensoroni/files/sensoroni.json
index db240fa91..d53fe0a66 100644
--- a/salt/sensoroni/files/sensoroni.json
+++ b/salt/sensoroni/files/sensoroni.json
@@ -1,9 +1,9 @@
 {%- set MASTERIP = salt['pillar.get']('static:masterip', '') -%}
 {%- set SENSORONIKEY = salt['pillar.get']('static:sensoronikey', '') -%}
 {
-  "logFilename": "sensoroni-server.log",
+  "logFilename": "/opt/sensoroni/logs/sensoroni-server.log",
   "server": {
-    "bindAddress": "{{ MASTERIP }}:9822",
+    "bindAddress": "0.0.0.0:9822",
     "maxPacketCount": 5000,
     "htmlDir": "html",
     "modules": {
@@ -17,7 +17,7 @@
         "elasticsearchVerifyCert": false
       },
       "statickeyauth": {
-        "anonymousCidr": "{{ MASTERIP }}/32",
+        "anonymousCidr": "172.17.0.0/24",
         "apiKey": "{{ SENSORONIKEY }}"
       }
     }
diff --git a/salt/sensoroni/init.sls b/salt/sensoroni/init.sls
index e84dea38a..e40058e97 100644
--- a/salt/sensoroni/init.sls
+++ b/salt/sensoroni/init.sls
@@ -38,10 +38,12 @@ so-sensoroni:
     - image: soshybridhunter/so-sensoroni:HH1.1.0
     - hostname: sensoroni
     - name: so-sensoroni
-    - user: socore
     - binds:
       - /nsm/sensoroni/jobs:/opt/sensoroni/jobs:rw
       - /opt/so/conf/sensoroni/sensoroni.json:/opt/sensoroni/sensoroni.json:ro
-      - /opt/so/log/sensoroni/sensoroni-server.log:/opt/sensoroni/sensoroni-server.log:rw
+      - /opt/so/log/sensoroni/:/opt/sensoroni/log/:rw
     - port_bindings:
       - 0.0.0.0:9822:9822
+    - force: True
+    - watch:
+      - file: /opt/so/conf/sensoroni/sensoroni.json