Merge pull request #83 from dlee35/master

update whiptail text
This commit is contained in:
Mike Reeves
2019-05-16 09:12:28 -04:00
committed by GitHub
2 changed files with 8 additions and 3 deletions

View File

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

View File

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