mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-27 11:23:14 +01:00
Merge master into dev to pull in 2.0.1-rc.1 patch
This commit is contained in:
@@ -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"\
|
||||
|
||||
Reference in New Issue
Block a user