Merge pull request #1285 from Security-Onion-Solutions/fix/so_stop_start_restart

Require at least one arg for start/stop/restart scripts

salt/common/tools/sbin/so-restart

@@ -19,12 +19,13 @@
 
 . /usr/sbin/so-common
 
+if [ $# -ge 1 ]; then
+
         echo $banner
         printf "Restarting $1...\n\nThis could take a while if another Salt job is running. \nRun this command with --force to stop all Salt jobs before proceeding.\n"
         echo $banner
 
-if [ "$2" = "--force" ]
-then
+        if [ "$2" = "--force" ]; then
                 printf "\nForce-stopping all Salt jobs before proceeding\n\n"
                 salt-call saltutil.kill_all_jobs
         fi
@@ -34,3 +35,6 @@ case $1 in
                 "steno") docker stop so-steno && docker rm so-steno && salt-call state.apply pcap queue=True;;
                 *)  docker stop so-$1 ; docker rm so-$1 ; salt-call state.apply $1 queue=True;;
         esac
+else
+        echo -e "\nPlease provide an argument by running like so-restart $component, or by using the component-specific script.\nEx. so-restart filebeat, or so-filebeat-restart\n"
+fi

salt/common/tools/sbin/so-start

@@ -19,12 +19,12 @@
 
 . /usr/sbin/so-common
 
+if [ $# -ge 1 ]; then
 	echo $banner
 	printf "Starting $1...\n\nThis could take a while if another Salt job is running. \nRun this command with --force to stop all Salt jobs before proceeding.\n"
 	echo $banner
 
-if [ "$2" = "--force" ]
-then
+	if [ "$2" = "--force" ]; then
    		printf "\nForce-stopping all Salt jobs before proceeding\n\n"
    		salt-call saltutil.kill_all_jobs
 	fi
@@ -34,3 +34,6 @@ case $1 in
    		"steno") if docker ps | grep -q so-$1; then printf "\n$1 is already running!\n\n"; else docker rm so-$1 >/dev/null 2>&1 ; salt-call state.apply pcap queue=True; fi ;; 
    		*) if docker ps | grep -E -q '^so-$1$'; then printf "\n$1 is already running\n\n"; else docker rm so-$1 >/dev/null 2>&1 ; salt-call state.apply $1 queue=True; fi ;; 
 	esac
+else
+	echo -e "\nPlease provide an argument by running like so-start $component, or by using the component-specific script.\nEx. so-start filebeat, or so-filebeat-start\n"	
+fi

salt/common/tools/sbin/so-stop

@@ -19,6 +19,7 @@
 
 . /usr/sbin/so-common
 
+if [ $# -ge 1 ]; then
 	echo $banner
 	printf "Stopping $1...\n"
 	echo $banner
@@ -26,4 +27,7 @@ echo $banner
 	case $1 in
     		*) docker stop so-$1 ; docker rm so-$1 ;;
 	esac
+else
+	echo -e "\nPlease provide an argument by running like so-stop $component, or by using the component-specific script.\nEx. so-stop filebeat, or so-filebeat-stop\n"	
+fi