Merge pull request #108 from defensivedepth/playbook

Playbook & SOCtopus init edits

salt/playbook/files/nav_layer_playbook.json

@@ -15,11 +15,6 @@
 	"viewMode": 0,
 	"hideDisabled": "false",
 	"techniques": [{
-		"techniqueID": "T1003",
-		"color": "#5AADFF",
-		"comment": "",
-		"enabled": "true",
-		"metadata": []
 	}],
 	"gradient": {
 		"colors": ["#ff6666", "#ffe766", "#8ec843"],

salt/playbook/init.sls

@@ -1,15 +1,5 @@
-navigatordefaultlayer:
-  file.manage:
-    - name: /opt/so/conf/playbook/nav_layer_playbook.json
-    - source: salt://playbook/files/nav_layer_playbook.json
-    - user: 939
-    - group: 939
-    - makedirs: True
-    - replace: False
-    - template: jinja
-
 navigatorconfig:
-  file.manage:
+  file.managed:
     - name: /opt/so/conf/playbook/navigator_config.json
     - source: salt://playbook/files/navigator_config.json
     - user: 939

salt/soctopus/init.sls

@@ -28,19 +28,30 @@ playbookrulessync:
     - group: 939
     - template: jinja
 
+navigatordefaultlayer:
+  file.managed:
+    - name: /opt/so/conf/playbook/nav_layer_playbook.json
+    - source: salt://playbook/files/nav_layer_playbook.json
+    - user: 939
+    - group: 939
+    - makedirs: True
+    - replace: False
+    - template: jinja
+
 so-soctopusimage:
   cmd.run:
-    - name: docker pull --disable-content-trust=false soshybridhunter/so-soctopus:HH1.1.0
+    - name: docker pull --disable-content-trust=false soshybridhunter/so-soctopus:HH1.1.1
 
 so-soctopus:
   docker_container.running:
     - require:
       - so-soctopusimage
-    - image: soshybridhunter/so-soctopus:HH1.1.0
+    - image: soshybridhunter/so-soctopus:HH1.1.1
     - hostname: soctopus
     - name: so-soctopus
     - binds:
       - /opt/so/conf/soctopus/SOCtopus.conf:/SOCtopus/SOCtopus.conf:ro
       - /opt/so/rules/elastalert/playbook:/etc/playbook-rules:rw
+      - /opt/so/conf/playbook/nav_layer_playbook.json:/etc/playbook/nav_layer_playbook.json:rw
     - port_bindings:
       - 0.0.0.0:7000:7000