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 branch 'master' into feature/merge-2.3.51

Browse Source 
# Conflicts:
#	VERSION
#	salt/influxdb/init.sls
This commit is contained in:
William Wernert
2021-05-21 12:31:54 -04:00
parent de4fde4ee3 c5d0286e24
commit fe3aec173f
13 changed files with 45 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
salt/common/tools/sbin/so-common
View File

@@ -487,6 +487,7 @@ wait_for_web_response() {
expected=$2
maxAttempts=${3:-300}
logfile=/root/wait_for_web_response.log
truncate -s 0 "$logfile"
attempt=0
while [[ $attempt -lt $maxAttempts ]]; do
attempt=$((attempt+1))