-
Notifications
You must be signed in to change notification settings - Fork 532
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12144 from Security-Onion-Solutions/salt3006.5
Salt3006.5
- Loading branch information
Showing
2 changed files
with
4 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
#version cannot be used elsewhere in this pillar as soup is grepping for it to determine if Salt needs to be patched | ||
# When updating the salt version, also update the version in securityonion-builds/images/iso-task/Dockerfile and saltify function in so-functions | ||
# version cannot be used elsewhere in this pillar as soup is grepping for it to determine if Salt needs to be patched | ||
salt: | ||
master: | ||
version: 3006.3 | ||
version: 3006.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,6 @@ | ||
#version cannot be used elsewhere in this pillar as soup is grepping for it to determine if Salt needs to be patched | ||
# When updating the salt version, also update the version in securityonion-builds/images/iso-task/Dockerfile and saltify function in so-functions | ||
# version cannot be used elsewhere in this pillar as soup is grepping for it to determine if Salt needs to be patched | ||
salt: | ||
minion: | ||
version: 3006.3 | ||
version: 3006.5 | ||
check_threshold: 3600 # in seconds, threshold used for so-salt-minion-check. any value less than 600 seconds may cause a lot of salt-minion restarts since the job to touch the file occurs every 5-8 minutes by default | ||
service_start_delay: 30 # in seconds. |