From d7580fe6a05140c4ea265f731f7881fcf2538dab Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Mon, 29 Jun 2020 15:38:05 -0400
Subject: [PATCH 1/2] fix suricata state if suripins or suri procs arent set

---
 salt/suricata/suricata_config.map.jinja | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/salt/suricata/suricata_config.map.jinja b/salt/suricata/suricata_config.map.jinja
index a1d77cb08..6260c1ec1 100644
--- a/salt/suricata/suricata_config.map.jinja
+++ b/salt/suricata/suricata_config.map.jinja
@@ -1,6 +1,5 @@
 {% import_yaml 'suricata/defaults.yaml' as suricata_defaults with context %}
 {% import_yaml 'suricata/suricata_meta.yaml' as suricata_meta with context %}
-{% from 'suricata/threading.map.jinja' import cpu_affinity with context %}
 {% from 'suricata/afpacket.map.jinja' import afpacket %}
 {% set suricata_pillar = salt['pillar.get']('suricata:config', {}) %}
 {% set default_evelog_index = [] %}
@@ -50,8 +49,11 @@ HOME_NET: "[{{salt['pillar.get']('static:hnmaster', '')}}]"
 {% endif %}
 
 {% do suricata_defaults.suricata.config.update(default_packet_size) %}
-{% do suricata_defaults.suricata.config.threading.update(cpu_affinity) %}
 {% do suricata_defaults.suricata.config.update(afpacket) %}
 {% do suricata_defaults.suricata.config.vars['address-groups'].update(homenet) %}
+{% if salt['pillar.get']('sensor:suriprocs', salt['pillar.get']('sensor:suripins', {})) %}
+  {% from 'suricata/threading.map.jinja' import cpu_affinity with context %}
+  {% do suricata_defaults.suricata.config.threading.update(cpu_affinity) %}
+{% endif %}
 
 {% do salt['defaults.merge'](suricata_defaults.suricata.config, suricata_pillar, in_place=True) %}
\ No newline at end of file

From 23c036389982ef6f7ed9b61762adddfcfb841aa5 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Mon, 29 Jun 2020 15:54:17 -0400
Subject: [PATCH 2/2] [fix] Reference correct directory in nginx sls and remove
 navigator sls

---
 salt/navigator/init.sls | 22 ----------------------
 salt/soctopus/init.sls  |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 salt/navigator/init.sls

diff --git a/salt/navigator/init.sls b/salt/navigator/init.sls
deleted file mode 100644
index 67c5060f6..000000000
--- a/salt/navigator/init.sls
+++ /dev/null
@@ -1,22 +0,0 @@
-{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.2') %}
-{% set MASTER = salt['grains.get']('master') %}
-
-navigatorconfig:
-  file.managed:
-    - name: /opt/so/conf/navigator/navigator_config.json
-    - source: salt://navigator/files/navigator_config.json
-    - user: 939
-    - group: 939
-    - makedirs: True
-    - template: jinja
-
-so-navigator:
-  docker_container.running:
-    - image: {{ MASTER }}:5000/soshybridhunter/so-navigator:{{ VERSION }}
-    - hostname: navigator
-    - name: so-navigator
-    - binds:
-      - /opt/so/conf/navigator/navigator_config.json:/nav-app/src/assets/config.json:ro
-      - /opt/so/conf/navigator/nav_layer_playbook.json:/nav-app/src/assets/playbook.json:ro
-    - port_bindings:
-      - 0.0.0.0:4200:4200
diff --git a/salt/soctopus/init.sls b/salt/soctopus/init.sls
index ff30c3c1a..eb9114c58 100644
--- a/salt/soctopus/init.sls
+++ b/salt/soctopus/init.sls
@@ -52,7 +52,7 @@ playbookrulessync:
 navigatordefaultlayer:
   file.managed:
     - name: /opt/so/conf/navigator/nav_layer_playbook.json
-    - source: salt://navigator/files/nav_layer_playbook.json
+    - source: salt://nginx/files/nav_layer_playbook.json
     - user: 939
     - group: 939
     - makedirs: True