From 5ff0058a65e38d9bd48eaea4c7cac3573f8a20b1 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Wed, 19 Aug 2020 16:12:54 -0400
Subject: [PATCH] Ensure strelka backend, frontend, and filestream are
 connecting to redis locally, on heavy node instances

---
 salt/strelka/files/backend/backend.yaml       | 2 +-
 salt/strelka/files/filestream/filestream.yaml | 2 +-
 salt/strelka/files/frontend/frontend.yaml     | 2 +-
 setup/so-functions                            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/salt/strelka/files/backend/backend.yaml b/salt/strelka/files/backend/backend.yaml
index 8748a4fd6..96aa450b7 100644
--- a/salt/strelka/files/backend/backend.yaml
+++ b/salt/strelka/files/backend/backend.yaml
@@ -1,4 +1,4 @@
-{%- if grains.role == 'so-sensor' -%}
+{%- if grains.role in ['so-sensor', 'so-heavynode'] -%}
   {%- set mainint = salt['pillar.get']('sensor:mainint') %}
   {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %}
 {%- else %}
diff --git a/salt/strelka/files/filestream/filestream.yaml b/salt/strelka/files/filestream/filestream.yaml
index 1dc6795d9..681aad222 100644
--- a/salt/strelka/files/filestream/filestream.yaml
+++ b/salt/strelka/files/filestream/filestream.yaml
@@ -1,4 +1,4 @@
-{%- if grains.role == 'so-sensor' -%}
+{%- if grains.role in ['so-sensor', 'so-heavynode'] -%}
   {%- set mainint = salt['pillar.get']('sensor:mainint') %}
   {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %}
 {%- else %}
diff --git a/salt/strelka/files/frontend/frontend.yaml b/salt/strelka/files/frontend/frontend.yaml
index 23edef3e3..1233aadad 100644
--- a/salt/strelka/files/frontend/frontend.yaml
+++ b/salt/strelka/files/frontend/frontend.yaml
@@ -1,4 +1,4 @@
-{%- if grains.role == 'so-sensor' -%}
+{%- if grains.role in ['so-sensor', 'so-heavynode'] -%}
   {%- set mainint = salt['pillar.get']('sensor:mainint') %}
   {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %}
 {%- else %}
diff --git a/setup/so-functions b/setup/so-functions
index dc81ddafe..57f4e4504 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -710,10 +710,10 @@ detect_os() {
 disable_auto_start() {
 	
 	# Remove the automated setup script from crontab, if it exists
-	crontab -u $INSTALLUSERNAME -r
+	logCmd "crontab -u $INSTALLUSERNAME -r"
 
 	# Truncate last line of the bash profile
-	sed -i '$ d' /home/$INSTALLUSERNAME/.bash_profile 
+	logCmd "sed -i '$ d' /home/$INSTALLUSERNAME/.bash_profile"
 
 }