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

Setup Script - Create Checkin at Boot to fix a race condition

Browse Source
This commit is contained in:
Mike Reeves
2018-10-02 16:13:17 -04:00
parent 3d225f92ed
commit 22ed4f2ab6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
so-setup-network.sh
View File

@@ -84,6 +84,10 @@ calculate_useable_cores() {
} }
checkin_at_boot() {
echo "startup_states: highstate" >> /etc/salt/minion
}
chown_salt_master() { chown_salt_master() {
# Chown the salt dirs on the master for socore # Chown the salt dirs on the master for socore
@@ -101,11 +105,9 @@ configure_minion() {
if [ $TYPE == 'master' ]; then if [ $TYPE == 'master' ]; then
echo "master: $HOSTNAME" > /etc/salt/minion echo "master: $HOSTNAME" > /etc/salt/minion
echo "id: $HOSTNAME" >> /etc/salt/minion echo "id: $HOSTNAME" >> /etc/salt/minion
echo "startup_states: highstate" >> /etc/salt/minion
else else
echo "master: $MSRV" > /etc/salt/minion echo "master: $MSRV" > /etc/salt/minion
echo "id: $HOSTNAME" >> /etc/salt/minion echo "id: $HOSTNAME" >> /etc/salt/minion
echo "startup_states: highstate" >> /etc/salt/minion
fi fi
@@ -1091,6 +1093,7 @@ if (whiptail_you_sure); then
# Do the big checkin but first let them know it will take a bit. # Do the big checkin but first let them know it will take a bit.
salt_checkin_message salt_checkin_message
salt_checkin salt_checkin
checkin_at_boot
whiptail_setup_complete whiptail_setup_complete
@@ -1130,6 +1133,7 @@ if (whiptail_you_sure); then
# Do the big checkin but first let them know it will take a bit. # Do the big checkin but first let them know it will take a bit.
salt_checkin_message salt_checkin_message
salt_checkin salt_checkin
checkin_at_boot
whiptail_setup_complete whiptail_setup_complete
@@ -1154,6 +1158,7 @@ if (whiptail_you_sure); then
accept_salt_key_local accept_salt_key_local
salt_checkin_message salt_checkin_message
salt_checkin salt_checkin
checkin_at_boot
fi fi
if [ $INSTALLTYPE == 'STORAGENODE' ] || [ $INSTALLTYPE == 'PARSINGNODE' ] || [ $INSTALLTYPE == 'HOTNODE' ] || [ $INSTALLTYPE == 'WARMNODE' ]; then if [ $INSTALLTYPE == 'STORAGENODE' ] || [ $INSTALLTYPE == 'PARSINGNODE' ] || [ $INSTALLTYPE == 'HOTNODE' ] || [ $INSTALLTYPE == 'WARMNODE' ]; then
@@ -1194,6 +1199,7 @@ if (whiptail_you_sure); then
# Do the big checkin but first let them know it will take a bit. # Do the big checkin but first let them know it will take a bit.
salt_checkin_message salt_checkin_message
salt_checkin salt_checkin
checkin_at_boot
whiptail_setup_complete whiptail_setup_complete
fi fi