diff --git a/salt/suricata/manager.sls b/salt/suricata/manager.sls index e287069cb..5998a484b 100644 --- a/salt/suricata/manager.sls +++ b/salt/suricata/manager.sls @@ -1,10 +1,3 @@ -nidsrulesdir: - file.directory: - - name: /opt/so/rules/nids - - user: 939 - - group: 939 - - makedirs: True - surilocaldir: file.directory: - name: /opt/so/saltstack/local/salt/suricata diff --git a/salt/top.sls b/salt/top.sls index 316523f08..509f6b2c2 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -397,6 +397,7 @@ base: - nginx - soc - firewall + - idstools - suricata.manager - elasticsearch - kibana diff --git a/setup/so-setup b/setup/so-setup index 3bdc82c0e..d9a13210c 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -533,10 +533,8 @@ fi set_progress_str 60 "$(print_salt_state_apply 'manager')" salt-call state.apply -l info manager >> $setup_log 2>&1 - if [[ ! $is_importpcap ]]; then - set_progress_str 61 "$(print_salt_state_apply 'idstools')" - salt-call state.apply -l info idstools >> $setup_log 2>&1 - fi + set_progress_str 61 "$(print_salt_state_apply 'idstools')" + salt-call state.apply -l info idstools >> $setup_log 2>&1 set_progress_str 61 "$(print_salt_state_apply 'suricata.manager')" salt-call state.apply -l info suricata.manager >> $setup_log 2>&1