From 3abb4d79bacd3e4dcc5f6597e54bb5c43968c915 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 16 May 2023 16:07:06 -0400 Subject: [PATCH 1/3] change path where SALTVERSION is pulled from --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 9a4be972d..9dd1b7713 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -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 From f7ddf57f39c1a5fb5a6063b055bfb640e3836bd7 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 17 May 2023 15:49:22 -0400 Subject: [PATCH 2/3] move files out of config --- salt/soc/soc_soc.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/salt/soc/soc_soc.yaml b/salt/soc/soc_soc.yaml index 6551b632b..e0835937c 100644 --- a/salt/soc/soc_soc.yaml +++ b/salt/soc/soc_soc.yaml @@ -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 From e15c14cc2e8ce186b0dd3dae7b4e0dc493715ab3 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 17 May 2023 15:50:31 -0400 Subject: [PATCH 3/3] fix indent --- salt/soc/soc_soc.yaml | 60 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/salt/soc/soc_soc.yaml b/salt/soc/soc_soc.yaml index e0835937c..d3a94691e 100644 --- a/salt/soc/soc_soc.yaml +++ b/salt/soc/soc_soc.yaml @@ -2,36 +2,36 @@ soc: enabled: description: You can enable or disable SOC. advanced: True - files: - soc: - banner__md: - title: Login Banner - description: Customize the login page with a specific markdown-formatted message. - file: True - global: True - syntax: md - helpLink: soc-customization.html - motd__md: - title: Overview Page - description: Customize the overview page with specific markdown-formatted content. Images can be used but must be hosted from another host that is accessible by the user's browser. - file: True - global: True - syntax: md - helpLink: soc-customization.html - custom__js: - title: Custom Javascript - description: Customize SOC UI behavior with custom Javascript code. Custom Javascript not provided by Security Onion Solutions is unsupported, and should be removed prior to requesting support and prior to performing upgrades. - file: True - global: True - advanced: True - helpLink: soc-customization.html - custom_roles: - title: Custom Roles - description: Customize role and permission mappings. Changing this setting requires a complete understanding of the SOC RBAC system. - file: True - global: True - advanced: True - helpLink: soc-customization.html + files: + soc: + banner__md: + title: Login Banner + description: Customize the login page with a specific markdown-formatted message. + file: True + global: True + syntax: md + helpLink: soc-customization.html + motd__md: + title: Overview Page + description: Customize the overview page with specific markdown-formatted content. Images can be used but must be hosted from another host that is accessible by the user's browser. + file: True + global: True + syntax: md + helpLink: soc-customization.html + custom__js: + title: Custom Javascript + description: Customize SOC UI behavior with custom Javascript code. Custom Javascript not provided by Security Onion Solutions is unsupported, and should be removed prior to requesting support and prior to performing upgrades. + file: True + global: True + advanced: True + helpLink: soc-customization.html + custom_roles: + title: Custom Roles + description: Customize role and permission mappings. Changing this setting requires a complete understanding of the SOC RBAC system. + file: True + global: True + advanced: True + helpLink: soc-customization.html config: licenseKey: title: License Key