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

Merge remote-tracking branch 'origin/2.4/dev' into 2.4/ubuntu

Browse Source
This commit is contained in:
m0duspwnens
2023-04-13 09:10:58 -04:00
parent e4e326cd06 a8d3363a6f
commit 0485c83388
10 changed files with 118 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
setup/so-functions
View File

@@ -775,11 +775,12 @@ check_requirements() {
}
check_sos_appliance() {
title "Is this is an SOS Appliance?"
if [ -f "/etc/SOSMODEL" ]; then
local MODEL=$(cat /etc/SOSMODEL)
info "Found SOS Model $MODEL"
echo "sosmodel: $MODEL" >> /etc/salt/grains
local MODEL=$(cat /etc/SOSMODEL)
info "Found SOS Model $MODEL"
echo "sosmodel: $MODEL" >> /etc/salt/grains
else
info "Not an appliance"
fi
}

2
setup/so-setup
View File

@@ -599,6 +599,7 @@ if ! [[ -f $install_opt_file ]]; then
# Start the master service
copy_salt_master_config
configure_minion "$minion_type"
check_sos_appliance
logCmd "salt-key -yd $MINION_ID"
logCmd "salt-call state.show_top"
@@ -661,6 +662,7 @@ if ! [[ -f $install_opt_file ]]; then
update_packages
saltify
configure_minion "$minion_type"
check_sos_appliance
drop_install_options
checkin_at_boot
logCmd "salt-call state.apply setup.highstate_cron --local --file-root=../salt/"