From 8342dc1447472c8435b599e8aee564f6b4b03b57 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Mon, 9 Dec 2019 12:49:46 -0500
Subject: [PATCH] Helix node type

---
 pillar/top.sls     | 3 +++
 setup/functions.sh | 2 +-
 setup/so-setup.sh  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pillar/top.sls b/pillar/top.sls
index 77e0c1672..992549ffa 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -29,5 +29,8 @@ base:
     - firewall.*
 
   'G@role:so-helix':
+    - masters.{{ grains.id }}
+    - static
+    - firewall.*
     - fireeye
     - static
diff --git a/setup/functions.sh b/setup/functions.sh
index a00cb7b25..951a37a87 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -406,7 +406,7 @@ docker_install() {
     yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
     yum -y update
     yum -y install docker-ce python36-docker
-    if [ $INSTALLTYPE != 'EVALMODE' ] || [ $INSTALLTYPE == 'HELIXSENSOR' ]; then
+    if [ $INSTALLTYPE != 'EVALMODE' ]; then
       docker_registry
     fi
     echo "Restarting Docker" >> $SETUPLOG 2>&1
diff --git a/setup/so-setup.sh b/setup/so-setup.sh
index e9c2a4076..a2889a0da 100644
--- a/setup/so-setup.sh
+++ b/setup/so-setup.sh
@@ -180,7 +180,7 @@ if (whiptail_you_sure) ; then
       docker_install >> $SETUPLOG 2>&1
       echo -e "XXX\n10\nConfiguring Salt Master... \nXXX"
       echo " ** Configuring Minion **" >> $SETUPLOG
-      configure_minion master >> $SETUPLOG 2>&1
+      configure_minion helix >> $SETUPLOG 2>&1
       echo " ** Installing Salt Master **" >> $SETUPLOG
       install_master >> $SETUPLOG 2>&1
       salt_master_directories >> $SETUPLOG 2>&1