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

Merge branch 'feature/setup' into experimental

Browse Source
This commit is contained in:
William Wernert
2020-12-09 13:13:58 -05:00
parent e29fa7ba70 a2e48f91b2
commit 522399e4ab
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
setup/so-functions
View File

@@ -993,6 +993,7 @@ generate_passwords(){
} }
generate_repo_tarball() { generate_repo_tarball() {
mkdir /opt/so/repo
tar -czf /opt/so/repo/"$SOVERSION".tar.gz ../. tar -czf /opt/so/repo/"$SOVERSION".tar.gz ../.
} }

32
setup/so-setup
View File

@@ -261,12 +261,21 @@ if ! [ -f /root/install_opt ]; then
whiptail_management_interface_setup whiptail_management_interface_setup
fi fi
# Init networking so rest of install works
disable_ipv6
if [[ "$setup_type" == 'iso' ]]; then if [[ "$setup_type" == 'iso' ]]; then
# Init networking so rest of install works
set_hostname set_hostname
set_management_interface set_management_interface
fi fi
if [[ -n "$TURBO" ]]; then
use_turbo_proxy
fi
if [[ $is_minion ]]; then
add_mngr_ip_to_hosts
fi
if [[ $is_minion ]]; then if [[ $is_minion ]]; then
[ "$automated" == no ] && copy_ssh_key >> $setup_log 2>&1 [ "$automated" == no ] && copy_ssh_key >> $setup_log 2>&1
fi fi
@@ -464,25 +473,10 @@ catch() {
exit exit
} }
# Init networking so rest of install works
if [[ -n "$TURBO" ]]; then
use_turbo_proxy
fi
disable_ipv6
if [[ "$setup_type" != 'iso' ]]; then
set_hostname >> $setup_log 2>&1
fi
if [[ $is_minion ]]; then
add_mngr_ip_to_hosts
fi
# This block sets REDIRECTIT which is used by a function outside the below subshell # This block sets REDIRECTIT which is used by a function outside the below subshell
set_main_ip >> $setup_log 2>&1 set_main_ip >> $setup_log 2>&1
compare_main_nic_ip compare_main_nic_ip
set_redirect >> $setup_log 2>&1 set_redirect >> $setup_log 2>&1
# Begin install # Begin install
{ {