CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-06-23 02:38:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge with dev, fix confict

Browse Source
This commit is contained in:
m0duspwnens
2023-10-24 09:40:09 -04:00
parent f03bbdbc09 0c2b3f3c62
commit 752390be2e
7 changed files with 64 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
salt/salt/engines/master/checkmine.py
+9
View File
@@ -67,6 +67,11 @@ def start(interval=60):
mine_delete(minion, 'x509.get_pem_entries')
mine_update(minion)
continue
except KeyError:
log.error('checkmine engine: found minion %s is not in the mine' % (minion))
mine_flush(minion)
mine_update(minion)
continue
# Update the mine if the ip in the mine doesn't match returned from manage.alived
network_ip_addrs = __salt__['saltutil.runner']('mine.get', tgt=minion, fun='network.ip_addrs')
@@ -77,5 +82,9 @@ def start(interval=60):
log.error('checkmine engine: found minion %s does\'t have a mine_ip' % (minion))
mine_delete(minion, 'network.ip_addrs')
mine_update(minion)
except KeyError:
log.error('checkmine engine: found minion %s is not in the mine' % (minion))
mine_flush(minion)
mine_update(minion)
sleep(interval)