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

Merge remote-tracking branch 'remotes/origin/2.4/dev' into 2.4/firewall

Browse Source
This commit is contained in:
m0duspwnens
2023-01-09 11:18:08 -05:00
parent d4c6834cd0 73ae48d28e
commit c313b19b50
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
salt/common/files/vimrc
View File

@@ -3,4 +3,3 @@ filetype plugin indent on
" Sets .sls files to use YAML syntax highlighting " Sets .sls files to use YAML syntax highlighting
autocmd BufNewFile,BufRead *.sls set syntax=yaml autocmd BufNewFile,BufRead *.sls set syntax=yaml
set number

6
salt/common/tools/sbin/so-minion
View File

@@ -206,7 +206,7 @@ function createSTANDALONE() {
} }
function testConnection() { function testConnection() {
retry 5 10 "salt '$MINION_ID' test.ping" 0 retry 15 3 "salt '$MINION_ID' test.ping" 0
local ret=$? local ret=$?
if [[ $ret != 0 ]]; then if [[ $ret != 0 ]]; then
echo "The Minion has been accepted but is not online. Try again later" echo "The Minion has been accepted but is not online. Try again later"
@@ -230,9 +230,7 @@ if [[ "$OPERATION" = 'add' || "$OPERATION" = 'setup' ]]; then
if [ $OPERATION != 'setup' ]; then if [ $OPERATION != 'setup' ]; then
# Accept the salt key # Accept the salt key
acceptminion acceptminion
# Let the keys echange # Test to see if the minion was accepted
sleep 3
# Need logic here to try and salt ping.. If it doesn't work need to do something
testConnection testConnection
# Pull the info from the file to build what is needed # Pull the info from the file to build what is needed
getinstallinfo getinstallinfo

1
salt/filebeat/defaults.yaml
View File

@@ -27,6 +27,7 @@ filebeat:
- smtp - smtp
- snmp - snmp
- socks - socks
- software
- ssh - ssh
- ssl - ssl
- tunnel - tunnel