Skip to content

Commit

Permalink
Merge pull request #12144 from Security-Onion-Solutions/salt3006.5
Browse files Browse the repository at this point in the history
Salt3006.5
  • Loading branch information
m0duspwnens authored Jan 9, 2024
2 parents bf05efa + c9f2038 commit 0b919ff
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
5 changes: 2 additions & 3 deletions salt/salt/master.defaults.yaml
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
5 changes: 2 additions & 3 deletions salt/salt/minion.defaults.yaml
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.

0 comments on commit 0b919ff

Please sign in to comment.