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

[fix] Revert redirect fix for saltify and docker_seed_registry

Browse Source
This commit is contained in:
William Wernert
2020-05-19 12:41:19 -04:00
parent 7f08324862
commit 6d5af5b07a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
setup/so-setup
View File

@@ -278,10 +278,10 @@ fi
if [[ $is_sensor || $is_helix ]]; then if [[ $is_sensor || $is_helix ]]; then
set_progress_str 1 'Creating bond interface' set_progress_str 1 'Creating bond interface'
create_sensor_bond >> "$setup_log" 2>&1 create_sensor_bond >> $setup_log 2>&1
set_progress_str 2 'Generating sensor pillar' set_progress_str 2 'Generating sensor pillar'
sensor_pillar >> "$setup_log" 2>&1 sensor_pillar >> $setup_log 2>&1
fi fi
if [[ $is_minion ]]; then if [[ $is_minion ]]; then
@@ -290,7 +290,7 @@ fi
fi fi
set_progress_str 4 'Installing Salt and dependencies' set_progress_str 4 'Installing Salt and dependencies'
saltify >> $setup_log 2>&1 saltify 2>> $setup_log
set_progress_str 7 'Installing Docker and dependencies' set_progress_str 7 'Installing Docker and dependencies'
docker_install >> $setup_log 2>&1 docker_install >> $setup_log 2>&1
@@ -342,7 +342,7 @@ fi
if [[ $is_master ]]; then if [[ $is_master ]]; then
set_progress_str 20 'Accepting Salt key' set_progress_str 20 'Accepting Salt key'
salt-key -ya "$MINION_ID" >> "$setup_log" 2>&1 salt-key -ya "$MINION_ID" >> $setup_log 2>&1
fi fi
set_progress_str 21 'Copying minion pillars to master' set_progress_str 21 'Copying minion pillars to master'
@@ -362,8 +362,8 @@ fi
set_progress_str 26 'Downloading containers from the internet' set_progress_str 26 'Downloading containers from the internet'
fi fi
salt-call state.apply -l info registry >> "$setup_log" 2>&1 salt-call state.apply -l info registry >> $setup_log 2>&1
docker_seed_registry >> $setup_log 2>&1 # ~ 60% when finished docker_seed_registry 2>> "$setup_log" # ~ 60% when finished
set_progress_str 61 "$(print_salt_state_apply 'master')" set_progress_str 61 "$(print_salt_state_apply 'master')"
salt-call state.apply -l info master >> $setup_log 2>&1 salt-call state.apply -l info master >> $setup_log 2>&1
@@ -402,7 +402,7 @@ fi
if [[ $is_master ]]; then if [[ $is_master ]]; then
set_progress_str 69 "$(print_salt_state_apply 'soc')" set_progress_str 69 "$(print_salt_state_apply 'soc')"
salt-call state.apply -l info soc >> "$setup_log" 2>&1 salt-call state.apply -l info soc >> $setup_log 2>&1
set_progress_str 70 "$(print_salt_state_apply 'kibana')" set_progress_str 70 "$(print_salt_state_apply 'kibana')"
salt-call state.apply -l info kibana >> $setup_log 2>&1 salt-call state.apply -l info kibana >> $setup_log 2>&1