Merge master into dev to pull in 2.0.1-rc.1 patch

This commit is contained in:
Jason Ertel
2020-07-23 09:56:42 -04:00
8 changed files with 44 additions and 16 deletions

View File

@@ -990,9 +990,6 @@ manager_pillar() {
" lsheap: $LS_HEAP_SIZE"\
" ls_pipeline_workers: $num_cpu_cores"\
""\
"pcap:">> "$pillar_file"\
" sensor_checkin_interval_ms: $SENSOR_CHECKIN_INTERVAL_MS"\
""\
"idstools:"\
" config:"\
" ruleset: $RULESETUP"\
@@ -1028,10 +1025,10 @@ manager_static() {
" ids: $NIDS"\
" managerip: $MAINIP"\
" hiveuser: $WEBUSER"\
" hivepassword: $WEBPASSWD1"\
" hivepassword: '$WEBPASSWD1'"\
" hivekey: $HIVEKEY"\
" cortexuser: $WEBUSER"\
" cortexpassword: $WEBPASSWD1"\
" cortexpassword: '$WEBPASSWD1'"\
" cortexkey: $CORTEXKEY"\
" cortexorgname: SecurityOnion"\
" cortexorguser: $WEBUSER"\
@@ -1047,6 +1044,8 @@ manager_static() {
" wazuh: $WAZUH"\
" managerupdate: $MANAGERUPDATES"\
" imagerepo: $IMAGEREPO"\
"pcap:"\
" sensor_checkin_interval_ms: $SENSOR_CHECKIN_INTERVAL_MS"\
"strelka:"\
" enabled: $STRELKA"\
" rules: $STRELKARULES"\