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

Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into dev

Browse Source
This commit is contained in:
Mike Reeves
2021-05-04 10:44:13 -04:00
parent 21b92ac077 d4e8ea8e72
commit 8aaf3e1052
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
salt/elasticsearch/templates/so/so-common-template.json
View File

@@ -228,7 +228,11 @@
"event":{ "event":{
"type":"object", "type":"object",
"dynamic": true "dynamic": true
}, },
"event_data":{
"type":"object",
"dynamic": true
},
"file":{ "file":{
"type":"object", "type":"object",
"dynamic": true "dynamic": true

4
setup/so-setup
View File

@@ -291,7 +291,7 @@ if ! [[ -f $install_opt_file ]]; then
collect_hostname collect_hostname
fi fi
whiptail_node_description [[ ! ( $is_eval || $is_import ) ]] && whiptail_node_description
if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then
network_init_whiptail network_init_whiptail
@@ -960,4 +960,4 @@ fi
install_cleanup >> "$setup_log" 2>&1 install_cleanup >> "$setup_log" 2>&1
if [[ -z $SKIP_REBOOT ]]; then shutdown -r now; else exit; fi if [[ -z $SKIP_REBOOT ]]; then shutdown -r now; else exit; fi