From 5603afd2bd1eac58e13fb832b94e533d13894928 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 23 Jan 2020 15:36:26 -0500
Subject: [PATCH 1/2] quick fix for missing master search items in setup

---
 setup/functions.sh | 6 +++---
 setup/so-setup.sh  | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/setup/functions.sh b/setup/functions.sh
index 3629cda64..f23da15ba 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -864,7 +864,7 @@ saltify() {
   if [ $OS == 'centos' ]; then
     ADDUSER=adduser
 
-    if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ] || [ $INSTALLTYPE == 'HELIXSENSOR' ]; then
+    if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ] || [ $INSTALLTYPE == 'HELIXSENSOR' ] || [ $INSTALLTYPE == 'MASTERSEARCH' ]; then
       reserve_group_ids
       yum -y install wget https://repo.saltstack.com/py3/redhat/salt-py3-repo-latest-2.el7.noarch.rpm
       cp /etc/yum.repos.d/salt-py3-latest.repo /etc/yum.repos.d/salt-py3-2019-2.repo
@@ -1025,7 +1025,7 @@ EOF
     yum -y update exclude=salt*
     systemctl enable salt-minion
 
-    if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ] || [ $INSTALLTYPE == 'HELIXSENSOR' ]; then
+    if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ] || [ $INSTALLTYPE == 'HELIXSENSOR' ] || [ $INSTALLTYPE == 'MASTERSEARCH' ]; then
       yum -y install salt-master-2019.2.3 python3 python36-m2crypto salt-minion-2019.2.3 python36-dateutil python36-mysql python36-docker
       systemctl enable salt-master
     else
@@ -1045,7 +1045,7 @@ EOF
     UVER=$(grep VERSION_ID /etc/os-release | awk -F '[ "]' '{print $2}')
 
     # Nasty hack but required for now
-    if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then
+    if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ] || [ $INSTALLTYPE == 'MASTERSEARCH' ]; then
 
       # Install the repo for salt
       wget --inet4-only -O - https://repo.saltstack.com/apt/ubuntu/$UVER/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
diff --git a/setup/so-setup.sh b/setup/so-setup.sh
index 5e5331d64..a2501dfb9 100644
--- a/setup/so-setup.sh
+++ b/setup/so-setup.sh
@@ -527,12 +527,13 @@ if (whiptail_you_sure) ; then
       TYPE='eval'
       # Select which NICs are in the bond
       whiptail_bond_nics
-      # Snag the HOME_NET
-      whiptail_homenet_master
     elif [ $INSTALLTYPE == 'MASTERSEARCH' ]; then
       TYPE='mastersearch'
     fi
 
+    # Snag the HOME_NET
+    whiptail_homenet_master
+
     whiptail_eval_adv_warning
     whiptail_enable_components
 

From d4d5891c702097c82130bd8a95a1310ec77af088 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Thu, 23 Jan 2020 16:58:26 -0500
Subject: [PATCH 2/2] [fix] Remove require from hive init.sls

---
 salt/hive/init.sls | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/salt/hive/init.sls b/salt/hive/init.sls
index fca060528..c5cf72d39 100644
--- a/salt/hive/init.sls
+++ b/salt/hive/init.sls
@@ -85,8 +85,6 @@ so-thehive-es:
 # Install Cortex
 so-cortex:
   docker_container.running:
-    - require:
-      - so-corteximage
     - image: {{ MASTER }}:5000/soshybridhunter/so-thehive-cortex:HH{{ VERSION }}
     - hostname: so-cortex
     - name: so-cortex
@@ -104,8 +102,6 @@ cortexscript:
 
 so-thehive:
   docker_container.running:
-    - require:
-      - so-thehiveimage
     - image: {{ MASTER }}:5000/soshybridhunter/so-thehive:HH{{ VERSION }}
     - environment:
       - ELASTICSEARCH_HOST={{ MASTERIP }}