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

SO Setup - Fix checkin order

Browse Source
This commit is contained in:
Mike Reeves
2018-08-06 10:30:45 -04:00
parent 517c9b69c7
commit 96a2ed4db1
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
so-setup-network.sh
View File

@@ -442,6 +442,13 @@ saltify() {
} }
salt_firstcheckin() {
#First Checkin
salt-call state.highstate
}
salt_checkin() { salt_checkin() {
# Master State to Fix Mine Usage # Master State to Fix Mine Usage
if [ $INSTALLTYPE == 'MASTERONLY' ]; then if [ $INSTALLTYPE == 'MASTERONLY' ]; then
@@ -450,9 +457,9 @@ salt_checkin() {
salt-call state.apply ssl salt-call state.apply ssl
echo "Restarting Salt to fix any SSL errors." echo "Restarting Salt to fix any SSL errors."
service salt-master restart service salt-master restart
sleep 10 sleep 5
service salt-minion restart service salt-minion restart
sleep 10 sleep 5
salt-call state.highstate salt-call state.highstate
else else
@@ -969,7 +976,7 @@ if (whiptail_you_sure); then
master_pillar master_pillar
set_initial_firewall_policy set_initial_firewall_policy
# Do a checkin to push the key up # Do a checkin to push the key up
salt_checkin salt_firstcheckin
# Accept the Master Key # Accept the Master Key
accept_salt_key_local accept_salt_key_local
# 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.
@@ -1006,7 +1013,7 @@ if (whiptail_you_sure); then
saltify saltify
configure_minion SENSOR configure_minion SENSOR
copy_minion_pillar sensors copy_minion_pillar sensors
salt_checkin salt_firstcheckin
# Accept the Salt Key # Accept the Salt Key
accept_salt_key_remote accept_salt_key_remote
# 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.