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

Change retry delay + count

Browse Source
This commit is contained in:
William Wernert
2021-05-18 12:23:40 -04:00
parent dbd5ef70c9
commit bdd53ed5e3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,7 +332,7 @@ run_check_net_err() {
local exit_code local exit_code
if [[ -z $no_retry ]]; then if [[ -z $no_retry ]]; then
retry 20 30 "$cmd" retry 5 60 "$cmd"
exit_code=$? exit_code=$?
else else
eval "$cmd" eval "$cmd"

4
salt/common/tools/sbin/so-image-common
View File

@@ -130,7 +130,7 @@ update_docker_containers() {
# Let's make sure we have the public key # Let's make sure we have the public key
run_check_net_err \ run_check_net_err \
"curl --retry 20 --retry-delay 30 -sSL https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS -o $SIGNPATH/KEYS" \ "curl --retry 5 --retry-delay 60 -sSL https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS -o $SIGNPATH/KEYS" \
"Could not pull signature key file, please ensure connectivity to https://raw.gihubusercontent.com" \ "Could not pull signature key file, please ensure connectivity to https://raw.gihubusercontent.com" \
noretry >> "$LOG_FILE" 2>&1 noretry >> "$LOG_FILE" 2>&1
result=$? result=$?
@@ -158,7 +158,7 @@ update_docker_containers() {
# Get signature # Get signature
run_check_net_err \ run_check_net_err \
"curl --retry 20 --retry-delay 30 -A '$CURLTYPE/$CURRENTVERSION/$OS/$(uname -r)' https://sigs.securityonion.net/$VERSION/$i:$VERSION$IMAGE_TAG_SUFFIX.sig --output $SIGNPATH/$image.sig" \ "curl --retry 5 --retry-delay 60 -A '$CURLTYPE/$CURRENTVERSION/$OS/$(uname -r)' https://sigs.securityonion.net/$VERSION/$i:$VERSION$IMAGE_TAG_SUFFIX.sig --output $SIGNPATH/$image.sig" \
"Could not pull signature file, please ensure connectivity to https://sigs.securityonion.net " \ "Could not pull signature file, please ensure connectivity to https://sigs.securityonion.net " \
noretry >> "$LOG_FILE" 2>&1 noretry >> "$LOG_FILE" 2>&1
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then