mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-07 01:32:47 +01:00
Merge branch 'feature/ec2_setup' into feature/setup-changes
This commit is contained in:
@@ -108,7 +108,7 @@ export PATH=$PATH:../salt/common/tools/sbin
|
||||
|
||||
got_root
|
||||
|
||||
detect_os
|
||||
detect_os && detect_ec2
|
||||
|
||||
if [ "$OS" == ubuntu ]; then
|
||||
update-alternatives --set newt-palette /etc/newt/palette.original >> $setup_log 2>&1
|
||||
@@ -235,7 +235,7 @@ fi
|
||||
|
||||
# Start user prompts
|
||||
if [[ $is_helix || $is_sensor ]]; then
|
||||
whiptail_bond_nics
|
||||
whiptail_sensor_nics
|
||||
calculate_useable_cores
|
||||
fi
|
||||
|
||||
@@ -388,9 +388,8 @@ fi
|
||||
update_packages >> $setup_log 2>&1
|
||||
|
||||
if [[ $is_sensor || $is_helix ]]; then
|
||||
set_progress_str 3 'Creating bond interface'
|
||||
create_sensor_bond >> $setup_log 2>&1
|
||||
|
||||
set_progress_str 3 'Configuring sensor interface'
|
||||
configure_network_sensor >> $setup_log 2>&1
|
||||
set_progress_str 4 'Generating sensor pillar'
|
||||
sensor_pillar >> $setup_log 2>&1
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user