fix formatting in sosetup and variables in sosetup.conf

bin/sosetup

@@ -2264,26 +2264,28 @@ else
 	INTERFACES="$SNIFFING_INTERFACES"
 	ADVANCED_SETUP="1"
 	if [ $SKIP -ne 1 ];then
-		echo
-		echo "Security Onion Setup"
-		echo
-		echo "Ready to configure system using parameters in $ANSWERFILE."
-		echo
-		echo "WARNING! Continuing will destroy any existing data/config."
-		echo "Are you sure you want to continue?"
-		echo "Type yes to continue or anything else to exit."
-		read INPUT
-		[ "$INPUT" != "yes" ] && exit 0
-		soconf=$2
+		if [ "$ELASTIC" != "YES" ]; then
+			echo
+			echo "Security Onion Setup"
+			echo
+			echo "Ready to configure system using parameters in $ANSWERFILE."
+			echo
+			echo "WARNING! Continuing will destroy any existing data/config."
+			echo "Are you sure you want to continue?"
+			echo "Type yes to continue or anything else to exit."
+			read INPUT
+			[ "$INPUT" != "yes" ] && exit 0
+		else
+			SETUPCONF=$2
+		fi
 		echo
 		# If /etc/network/interfaces has not been configured yet, then we need
 		# to run sosetup-network and pass it the answerfile
 		if ! grep "Security Onion" /etc/network/interfaces >/dev/null 2>&1; then
 			/usr/sbin/sosetup-network $@
 		fi
 		if [ "$ELASTIC" == "YES" ]; then
-			echo "switching to Elastic setup!"
-			/usr/sbin/sosetup-elastic -f $soconf skipnetwork
+			/usr/sbin/sosetup-elastic -f $SETUPCONF skipnetwork
 			exit $?
 		fi
 	fi

share/securityonion/sosetup.conf

@@ -105,7 +105,7 @@ XPLICO_ENABLED='no'
 # If set to NO, then this box will not run ELSA components:
 # ELSA=NO
 # If you want to run ELSA, then you should enable this setting on every box in your deployment.
-ELSA=NO
+ELSA=YES
 
 # UPDATE_ELSA_SERVER
 # If SERVER=0, then the server's elsa_web.conf will need
@@ -118,7 +118,7 @@ ELSA=NO
 # If you'd rather update the server's elsa_web.conf yourself
 # and manually restart Apache, set this option to 'NO':
 # UPDATE_ELSA_SERVER='NO'
-UPDATE_ELSA_SERVER='NO'
+UPDATE_ELSA_SERVER='YES'
 
 # LOG_SIZE_LIMIT
 # This setting controls how much disk space ELSA uses.
@@ -134,7 +134,8 @@ LOG_SIZE_LIMIT='10000000000'
 ################################
 # Enable Elastic stack
 ################################
-ELASTIC=YES
+ELASTIC=NO
+
 ################################
 # Enable/disable services
 ################################