From 18eff68dc7cee0962cc7bcafd1ab822d0aba29d3 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Tue, 30 Oct 2018 16:44:13 -0400
Subject: [PATCH] Setup Script - Remove Master prompt for evalmode

---
 so-setup-network.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/so-setup-network.sh b/so-setup-network.sh
index b24ad6dd6..1d3a4da50 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -103,7 +103,7 @@ configure_minion() {
   echo "Configuring minion type as $TYPE"
   touch /etc/salt/grains
   echo "role: so-$TYPE" > /etc/salt/grains
-  if [ $TYPE == 'master' ]; then
+  if [ $TYPE == 'master' ] || [ $TYPE == 'eval' ]; then
     echo "master: $HOSTNAME" > /etc/salt/minion
     echo "id: $HOSTNAME" >> /etc/salt/minion
   else
@@ -1296,9 +1296,6 @@ if (whiptail_you_sure); then
     # 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
 
@@ -1314,13 +1311,19 @@ if (whiptail_you_sure); then
     LSINPUTTHREADS=1
     LSINPUTBATCHCOUNT=125
     whiptail_make_changes
-    configure_minion
-    copy_ssh_key
+    # Add the user so we can sit back and relax
+    echo ""
+    echo "**** Please set a password for socore. You will use this password when setting up other Nodes/Sensors"
+    echo ""
+    add_socore_user_master
     create_bond
     saltify
     docker_install
-    configure_minion sensor
+    install_master
+    configure_minion eval
     copy_minion_pillar sensors
+    set_node_type
+    node_pillar
     salt_firstcheckin
     accept_salt_key_local
     salt_checkin_message