From afaad4fe81b15f4abb99ab84de8a4cb85c172653 Mon Sep 17 00:00:00 2001 From: Dustin Lee Date: Thu, 9 May 2019 11:34:06 -0400 Subject: [PATCH 1/3] s/Installing ElasticSearch/Installing Kibana/ --- so-setup-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/so-setup-network.sh b/so-setup-network.sh index b31e86369..b9f98e5ee 100644 --- a/so-setup-network.sh +++ b/so-setup-network.sh @@ -1880,7 +1880,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 From 7778b99ad221402eb0667a7d862a7d05a490ec28 Mon Sep 17 00:00:00 2001 From: Dustin Lee Date: Wed, 15 May 2019 15:25:00 -0400 Subject: [PATCH 2/3] avoid installing registry on eval --- so-setup-network.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/so-setup-network.sh b/so-setup-network.sh index b9f98e5ee..487320f7f 100644 --- a/so-setup-network.sh +++ b/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 From 276cd02d12e8168b80f8e2d9404ca7c42d22ae29 Mon Sep 17 00:00:00 2001 From: Dustin Lee Date: Wed, 15 May 2019 16:24:13 -0400 Subject: [PATCH 3/3] force reinstantiation of new hive container --- salt/hive/init.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/hive/init.sls b/salt/hive/init.sls index 9bdb2c35d..81032b401 100644 --- a/salt/hive/init.sls +++ b/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: