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

Merge branch 'dev' into feature/setup

Browse Source
This commit is contained in:
William Wernert
2020-07-13 11:24:04 -04:00
parent c31c24ccd8 3bc492ebde
commit 06aa63dd14
11 changed files with 83 additions and 1272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
setup/so-setup
View File

@@ -188,7 +188,7 @@ case "$setup_type" in
whiptail_management_interface_dns_search
fi
collect_adminuser_inputs
#collect_adminuser_inputs
;;
'network')
whiptail_network_notice
@@ -343,8 +343,8 @@ if [[ "$setup_type" == 'iso' ]]; then
set_hostname_iso
set_management_interface
add_admin_user
disable_onion_user
#add_admin_user
disable_auto_start
fi
{
@@ -442,8 +442,10 @@ fi
set_progress_str 18 'Setting node type'
set_node_type >> $setup_log 2>&1
set_progress_str 19 'Generating search node pillar'
elasticsearch_pillar >> $setup_log 2>&1
if ! [[ $is_manager || $is_helix ]]; then
set_progress_str 19 'Generating search node pillar'
elasticsearch_pillar >> $setup_log 2>&1
fi
fi
if [[ $is_minion ]]; then