From 26217806288332682217454915869d152bf943ad Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Tue, 30 Oct 2018 13:25:21 -0400
Subject: [PATCH] Setup Script - Change top file

---
 salt/top.sls        | 17 ++++++++++++++---
 so-setup-network.sh | 13 +++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/salt/top.sls b/salt/top.sls
index a6a4dd344..ba7ab520f 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -8,11 +8,22 @@ base:
     - bro
     - filebeat
 
-  'G@role:eval':
+  'G@role:so-eval':
+    - ca
+    - ssl
     - common
-    - sensor
+    - firewall
     - master
-    - eval
+    - idstools
+    - redis
+    - elasticsearch
+    - logstash
+    - kibana
+    - utility
+    - pcap
+    - suricata
+    - bro
+
 
   'G@role:so-master':
     - ca
diff --git a/so-setup-network.sh b/so-setup-network.sh
index 1f6837070..3ca75bfbf 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -1253,13 +1253,26 @@ if (whiptail_you_sure); then
   #######################
 
   if [ $INSTALLTYPE == 'EVALMODE' ]; then
+    # Select the management NIC
     whiptail_management_nic
+
+    # Filter out the management NIC
     filter_nics
+
+    # Select which NICs are in the bond
     whiptail_bond_nics
+
+    # Set Management Server - Fix This
     whiptail_management_server
+
+    # Set the NIDS to suricata
     whiptail_nids
+
     whiptail_bro_version
     whiptail_sensor_config
+    # Set a bunch of stuff since this is eval
+    es_heapsize
+    ls_heapsize
     NODE_ES_HEAP_SIZE=$ES_HEAP_SIZE
     NODE_LS_HEAP_SIZE=$LS_HEAP_SIZE
     LSPIPELINEWORKERS=1