CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-15 13:42:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/2.4/dev' into 2.4/smallfixes

Browse Source
This commit is contained in:
Josh Brower
2023-05-17 16:11:46 -04:00
parent 901e3c4a20 81842462ba
commit d11479ec5f
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
salt/soc/soc_soc.yaml
View File

@@ -2,16 +2,6 @@ soc:
enabled:
description: You can enable or disable SOC.
advanced: True
config:
licenseKey:
title: License Key
description: Optional Security Onion license key to unlock enterprise features.
global: True
logLevel:
title: Log Level
description: The SOC log level, useful for enabling debug logging for advanced troubleshooting. Allowed values are debug, info, warn, error. The SOC log is available at /opt/so/log/soc/sensoroni-server.log.
global: True
regex: ^(info|debug|warn|error)$
files:
soc:
banner__md:
@@ -42,6 +32,16 @@ soc:
global: True
advanced: True
helpLink: soc-customization.html
config:
licenseKey:
title: License Key
description: Optional Security Onion license key to unlock enterprise features.
global: True
logLevel:
title: Log Level
description: The SOC log level, useful for enabling debug logging for advanced troubleshooting. Allowed values are debug, info, warn, error. The SOC log is available at /opt/so/log/soc/sensoroni-server.log.
global: True
regex: ^(info|debug|warn|error)$
actions:
description: A list of actions a user can take from the SOC UI against a hunt, alert, and other records. The action must be defined in JSON object format, and contain a "name" key and "links" key. The links is a list of URLs, where the most suitable URL in the list will be the selected URL when the user clicks the action.
global: True

2
setup/so-functions
View File

@@ -2000,7 +2000,7 @@ repo_sync_local() {
}
saltify() {
SALTVERSION=$(egrep 'version: [0-9]{4}' /opt/so/saltstack/default/salt/salt/master.defaults.yaml | sed 's/^.*version: //')
SALTVERSION=$(egrep 'version: [0-9]{4}' ../salt/salt/master.defaults.yaml | sed 's/^.*version: //')
if [[ $is_ubuntu ]]; then
DEBIAN_FRONTEND=noninteractive retry 150 20 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1 || exit 1