Setup Script - Remove Master prompt for evalmode

This commit is contained in:
Mike Reeves
2018-10-30 16:44:13 -04:00
parent b30be6b660
commit 18eff68dc7

View File

@@ -103,7 +103,7 @@ configure_minion() {
echo "Configuring minion type as $TYPE" echo "Configuring minion type as $TYPE"
touch /etc/salt/grains touch /etc/salt/grains
echo "role: so-$TYPE" > /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 "master: $HOSTNAME" > /etc/salt/minion
echo "id: $HOSTNAME" >> /etc/salt/minion echo "id: $HOSTNAME" >> /etc/salt/minion
else else
@@ -1296,9 +1296,6 @@ if (whiptail_you_sure); then
# Select which NICs are in the bond # Select which NICs are in the bond
whiptail_bond_nics whiptail_bond_nics
# Set Management Server - Fix This
whiptail_management_server
# Set the NIDS to suricata # Set the NIDS to suricata
whiptail_nids whiptail_nids
@@ -1314,13 +1311,19 @@ if (whiptail_you_sure); then
LSINPUTTHREADS=1 LSINPUTTHREADS=1
LSINPUTBATCHCOUNT=125 LSINPUTBATCHCOUNT=125
whiptail_make_changes whiptail_make_changes
configure_minion # Add the user so we can sit back and relax
copy_ssh_key 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 create_bond
saltify saltify
docker_install docker_install
configure_minion sensor install_master
configure_minion eval
copy_minion_pillar sensors copy_minion_pillar sensors
set_node_type
node_pillar
salt_firstcheckin salt_firstcheckin
accept_salt_key_local accept_salt_key_local
salt_checkin_message salt_checkin_message