From e656e5af454e12f3218b365133d9d6b5c7fa35b7 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Wed, 12 Feb 2020 09:26:34 -0500
Subject: [PATCH] [fix] so-functions and so-restart

---
 salt/common/tools/sbin/so-restart | 2 +-
 setup/so-functions                | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/salt/common/tools/sbin/so-restart b/salt/common/tools/sbin/so-restart
index 3714e324a..2e3c0a00c 100755
--- a/salt/common/tools/sbin/so-restart
+++ b/salt/common/tools/sbin/so-restart
@@ -32,6 +32,6 @@ fi
 case $1 in
    "cortex") docker stop so-thehive-cortex so-thehive && docker rm so-thehive-cortex so-thehive && salt-call state.apply hive queue=True;;
    "steno") docker stop so-steno && docker rm so-steno && salt-call state.apply pcap queue=True;;
-   "auth") docker stop so-auth-api; docker stop so-auth-ui; salt-cal state.apply auth queue=True;;
+   "auth") docker stop so-auth-api; docker stop so-auth-ui; salt-call state.apply auth queue=True;;
    *)  docker stop so-$1 ; docker rm so-$1 ; salt-call state.apply $1 queue=True;;
 esac
diff --git a/setup/so-functions b/setup/so-functions
index f4c2eb621..b9367890d 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1034,19 +1034,11 @@ EOF
     fi
 
     yum clean expire-cache
-<<<<<<< HEAD:setup/so-functions
     yum -y install epel-release salt-minion-2019.2.3 yum-utils device-mapper-persistent-data lvm2 openssl jq
     yum -y update exclude=salt*
     systemctl enable salt-minion
 
     if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ] || [ $INSTALLTYPE == 'HELIXSENSOR' ] || [ $INSTALLTYPE == 'MASTERSEARCH' ]; then
-=======
-    yum -y install epel-release salt-minion-2019.2.3 yum-utils device-mapper-persistent-data lvm2 openssl
-    yum -y update exclude=salt*
-    systemctl enable salt-minion
-
-    if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ] || [ $INSTALLTYPE == 'HELIXSENSOR' ]; then
->>>>>>> master:setup/functions.sh
       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