mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-07 17:52:46 +01:00
Merge branch '2.4/dev' into kilo
This commit is contained in:
@@ -897,6 +897,7 @@ create_manager_pillars() {
|
||||
kratos_pillar
|
||||
soc_pillar
|
||||
idh_pillar
|
||||
influxdb_pillar
|
||||
|
||||
}
|
||||
|
||||
@@ -1536,6 +1537,9 @@ influxdb_pillar() {
|
||||
title "Create the influxdb pillar file"
|
||||
touch $adv_influxdb_pillar_file
|
||||
touch $influxdb_pillar_file
|
||||
printf '%s\n'\
|
||||
"influxdb:"\
|
||||
" token: $INFLUXTOKEN" > $local_salt_dir/pillar/influxdb/token.sls
|
||||
}
|
||||
|
||||
make_some_dirs() {
|
||||
@@ -1711,7 +1715,7 @@ process_installtype() {
|
||||
elif [ "$install_type" = 'SEARCHNODE' ]; then
|
||||
is_searchnode=true
|
||||
elif [ "$install_type" = 'HEAVYNODE' ]; then
|
||||
is_heavy=true
|
||||
is_heavynode=true
|
||||
elif [ "$install_type" = 'FLEET' ]; then
|
||||
is_fleet=true
|
||||
elif [ "$install_type" = 'IDH' ]; then
|
||||
@@ -2077,8 +2081,7 @@ secrets_pillar(){
|
||||
" playbook_admin: $PLAYBOOKADMINPASS"\
|
||||
" playbook_automation: $PLAYBOOKAUTOMATIONPASS"\
|
||||
" playbook_automation_api_key: "\
|
||||
" influx_pass: $INFLUXPASS"\
|
||||
" influx_token: $INFLUXTOKEN" > $local_salt_dir/pillar/secrets.sls
|
||||
" influx_pass: $INFLUXPASS" > $local_salt_dir/pillar/secrets.sls
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user