CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix jinja and change state orrder in setup

Browse Source
This commit is contained in:
William Wernert
2020-10-01 17:16:26 -04:00
parent a5bf4bbb35
commit e98012ae2c
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/playbook/files/playbook_db_init.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash
# {%- set MYSQLPASS = salt['pillar.get']('secrets:mysql', None) -%}
# {%- set admin_pass = salt['pillar.get']('secrets:playbook_admin', None) -%}
# {%- set admin_pass = salt['pillar.get']('secrets:playbook_admin', None) %}
default_salt_dir=/opt/so/saltstack/default

24
setup/so-setup
View File

@@ -640,28 +640,28 @@ fi
salt-call state.apply -l info kibana >> $setup_log 2>&1
fi
if [[ $is_manager ]]; then
set_progress_str 71 "$(print_salt_state_apply 'elastalert')"
salt-call state.apply -l info elastalert >> $setup_log 2>&1
set_progress_str 72 "$(print_salt_state_apply 'soctopus')"
salt-call state.apply -l info soctopus >> $setup_log 2>&1
fi
if [[ "$PLAYBOOK" = 1 ]]; then
set_progress_str 73 "$(print_salt_state_apply 'playbook.db_init')"
set_progress_str 71 "$(print_salt_state_apply 'playbook.db_init')"
salt-call state.apply -l info playbook.db_init >> $setup_log 2>&1
set_progress_str 73 "$(print_salt_state_apply 'playbook')"
set_progress_str 71 "$(print_salt_state_apply 'playbook')"
salt-call state.apply -l info playbook >> $setup_log 2>&1
set_progress_str 73 "$(print_salt_state_apply 'playbook.automation_user_create')"
set_progress_str 71 "$(print_salt_state_apply 'playbook.automation_user_create')"
salt-call state.apply -l info playbook.automation_user_create >> $setup_log 2>&1
set_progress_str 73 "Update playbook rules"
set_progress_str 71 "Update playbook rules"
so-playbook-ruleupdate >> /root/setup_playbook_rule_update.log 2>&1 &
fi
if [[ $is_manager ]]; then
set_progress_str 72 "$(print_salt_state_apply 'elastalert')"
salt-call state.apply -l info elastalert >> $setup_log 2>&1
set_progress_str 73 "$(print_salt_state_apply 'soctopus')"
salt-call state.apply -l info soctopus >> $setup_log 2>&1
fi
if [[ "$OSQUERY" = 1 ]]; then
if [[ "$PLAYBOOK" != 1 ]]; then
set_progress_str 74 "$(print_salt_state_apply 'mysql')"