Merge pull request #83 from dlee35/master

update whiptail text

salt/hive/init.sls

@@ -97,6 +97,7 @@ so-thehive:
       - /opt/so/conf/hive/etc/application.conf:/opt/thehive/conf/application.conf:ro
     - port_bindings:
       - 0.0.0.0:9000:9000
+    - force: true
 
 hivescript:
   cmd.script:

so-setup-network.sh

@@ -365,7 +365,9 @@ docker_install() {
     yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
     yum -y update
     yum -y install docker-ce docker-python python-docker
-    docker_registry
+    if [ $INSTALLTYPE != 'EVALMODE'  ]; then
+      docker_registry
+    fi
     echo "Restarting Docker" >>~/sosetup.log 2>&1
     systemctl restart docker
     systemctl enable docker
@@ -374,7 +376,9 @@ docker_install() {
     if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then
       apt-get update >>~/sosetup.log 2>&1
       apt-get -y install docker-ce >>~/sosetup.log 2>&1
-      docker_registry >>~/sosetup.log 2>&1
+      if [ $INSTALLTYPE != 'EVALMODE'  ]; then
+        docker_registry >>~/sosetup.log 2>&1
+      fi
       echo "Restarting Docker" >>~/sosetup.log 2>&1
       systemctl restart docker >>~/sosetup.log 2>&1
     else
@@ -1880,7 +1884,7 @@ if (whiptail_you_sure); then
       salt-call state.apply elasticsearch >>~/sosetup.log 2>&1
       echo -e "XXX\n40\nInstalling Logstash... \nXXX"
       salt-call state.apply logstash >>~/sosetup.log 2>&1
-      echo -e "XXX\n45\nInstalling ElasticSearch... \nXXX"
+      echo -e "XXX\n45\nInstalling Kibana... \nXXX"
       salt-call state.apply kibana >>~/sosetup.log 2>&1
       echo -e "XXX\n50\nInstalling pcap... \nXXX"
       salt-call state.apply pcap >>~/sosetup.log 2>&1