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

[fix] Move redirect var to function after $MAINIP has been set

Browse Source
This commit is contained in:
William Wernert
2020-07-14 10:12:51 -04:00
parent 178ac79da8
commit 4ab90a9a30
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
setup/so-functions
View File

@@ -871,17 +871,6 @@ get_redirect() {
if [ "$REDIRECTINFO" = "OTHER" ]; then if [ "$REDIRECTINFO" = "OTHER" ]; then
whiptail_set_redirect_host whiptail_set_redirect_host
fi fi
case $REDIRECTINFO in
'IP')
export REDIRECTIT="$MAINIP"
;;
'HOSTNAME')
export REDIRECTIT="$HOSTNAME"
;;
*)
export REDIRECTIT="$REDIRECTHOST"
;;
esac
} }
got_root() { got_root() {
@@ -1653,6 +1642,20 @@ set_node_type() {
esac esac
} }
set_redirect() {
case $REDIRECTINFO in
'IP')
REDIRECTIT="$MAINIP"
;;
'HOSTNAME')
REDIRECTIT="$HOSTNAME"
;;
*)
REDIRECTIT="$REDIRECTHOST"
;;
esac
}
set_updates() { set_updates() {
if [ "$MANAGERUPDATES" = '1' ]; then if [ "$MANAGERUPDATES" = '1' ]; then
if [ "$OS" = 'centos' ]; then if [ "$OS" = 'centos' ]; then

5
setup/so-setup
View File

@@ -369,7 +369,10 @@ if [[ $is_manager && ! $is_eval ]]; then
add_soremote_user_manager >> $setup_log 2>&1 add_soremote_user_manager >> $setup_log 2>&1
fi fi
set_main_ip >> $setup_log 2>&1 {
set_main_ip;
set_redirect;
} >> $setup_log 2>&1
host_pillar >> $setup_log 2>&1 host_pillar >> $setup_log 2>&1