From e76dc73ea62d7335266e4ac6a93f244621e2d9dc Mon Sep 17 00:00:00 2001 From: Wes Lambert Date: Wed, 12 Feb 2020 03:44:20 +0000 Subject: [PATCH] change Wazuh install order --- setup/so-setup | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/setup/so-setup b/setup/so-setup index 4fd81629e..6d86a0b7a 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -382,15 +382,15 @@ if (whiptail_you_sure) ; then echo -e "XXX\n41\nInstalling MySQL... \nXXX" salt-call state.apply mysql >> $SETUPLOG 2>&1 fi + if [[ $WAZUH == '1' ]]; then + echo -e "XXX\n68\nInstalling Wazuh... \nXXX" + salt-call state.apply wazuh >> $SETUPLOG 2>&1 + fi echo -e "XXX\n45\nInstalling Elastic Components... \nXXX" salt-call state.apply elasticsearch >> $SETUPLOG 2>&1 salt-call state.apply logstash >> $SETUPLOG 2>&1 salt-call state.apply kibana >> $SETUPLOG 2>&1 salt-call state.apply elastalert >> $SETUPLOG 2>&1 - if [[ $WAZUH == '1' ]]; then - echo -e "XXX\n68\nInstalling Wazuh... \nXXX" - salt-call state.apply wazuh >> $SETUPLOG 2>&1 - fi echo -e "XXX\n75\nInstalling Filebeat... \nXXX" salt-call state.apply filebeat >> $SETUPLOG 2>&1 salt-call state.apply utility >> $SETUPLOG 2>&1 @@ -649,6 +649,10 @@ if (whiptail_you_sure) ; then if [[ $OSQUERY == '1' ]]; then salt-call state.apply mysql >> $SETUPLOG 2>&1 fi + if [[ $WAZUH == '1' ]]; then + echo -e "XXX\n65\nInstalling Wazuh components... \nXXX" + salt-call state.apply wazuh >> $SETUPLOG 2>&1 + fi echo -e "XXX\n35\nInstalling ElasticSearch... \nXXX" salt-call state.apply elasticsearch >> $SETUPLOG 2>&1 echo -e "XXX\n40\nInstalling Logstash... \nXXX" @@ -674,10 +678,6 @@ if (whiptail_you_sure) ; then salt-call state.apply fleet >> $SETUPLOG 2>&1 salt-call state.apply redis >> $SETUPLOG 2>&1 fi - if [[ $WAZUH == '1' ]]; then - echo -e "XXX\n65\nInstalling Wazuh components... \nXXX" - salt-call state.apply wazuh >> $SETUPLOG 2>&1 - fi echo -e "XXX\n85\nInstalling filebeat... \nXXX" salt-call state.apply filebeat >> $SETUPLOG 2>&1 salt-call state.apply utility >> $SETUPLOG 2>&1