Setup Script - Hack the x509

This commit is contained in:
Mike Reeves
2018-10-11 10:20:10 -04:00
parent 4f74cc8962
commit e0c773855b

View File

@@ -526,7 +526,6 @@ salt_checkin() {
# Master State to Fix Mine Usage # Master State to Fix Mine Usage
if [ $INSTALLTYPE == 'MASTERONLY' ]; then if [ $INSTALLTYPE == 'MASTERONLY' ]; then
salt-call state.apply ca >>~/sosetup.log 2>&1 salt-call state.apply ca >>~/sosetup.log 2>&1
sudo salt '*' mine.send x509.get_pem_entries glob_path=/etc/pki/ca.crt
# salt-call state.apply ssl >>~/sosetup.log 2>&1 # salt-call state.apply ssl >>~/sosetup.log 2>&1
# salt-call state.apply common >>~/sosetup.log 2>&1 # salt-call state.apply common >>~/sosetup.log 2>&1
echo " *** Restarting Salt to fix any SSL errors. ***" echo " *** Restarting Salt to fix any SSL errors. ***"
@@ -534,6 +533,11 @@ salt_checkin() {
sleep 5 sleep 5
service salt-minion restart service salt-minion restart
sleep 5 sleep 5
echo " Applyng a mine hack "
sudo salt '*' mine.send x509.get_pem_entries glob_path=/etc/pki/ca.crt
echo " Applying SSL state "
salt-call state.apply ssl
echo " Oh run the rest of the checkin "
salt-call state.highstate salt-call state.highstate
else else