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 dev

Browse Source 
# Conflicts:
#	VERSION
This commit is contained in:
William Wernert
2020-07-24 11:50:34 -04:00
parent 9eeb527ea7 25f6ec861a
commit 6c9c60b8dd
7 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
setup/so-functions
View File

@@ -937,13 +937,6 @@ manager_pillar() {
local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls
if [ -z "$SENSOR_CHECKIN_INTERVAL_MS" ]; then
SENSOR_CHECKIN_INTERVAL_MS=10000
if [ "$install_type" = 'EVAL' ] || [ "$install_type" = 'STANDALONE' ]; then
SENSOR_CHECKIN_INTERVAL_MS=1000
fi
fi
# Create the manager pillar
printf '%s\n'\
"manager:"\
@@ -1014,6 +1007,13 @@ manager_pillar() {
manager_static() {
local static_pillar="$local_salt_dir/pillar/static.sls"
if [ -z "$SENSOR_CHECKIN_INTERVAL_MS" ]; then
SENSOR_CHECKIN_INTERVAL_MS=10000
if [ "$install_type" = 'EVAL' ] || [ "$install_type" = 'STANDALONE' ]; then
SENSOR_CHECKIN_INTERVAL_MS=1000
fi
fi
# Create a static file for global values
printf '%s\n'\
"static:"\