From d1eb7ef8490e57cd1fa667d08ebc9a46349fd5e5 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Tue, 13 Sep 2022 14:23:50 -0400 Subject: [PATCH 1/2] Always use local docs --- salt/soc/defaults.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/soc/defaults.yaml b/salt/soc/defaults.yaml index d162294ce..7c0f78f96 100644 --- a/salt/soc/defaults.yaml +++ b/salt/soc/defaults.yaml @@ -91,9 +91,9 @@ soc: userFiles: - rbac/users_roles client: - docsUrl: https://docs.securityonion.net/en/2.3/ - cheatsheetUrl: https://github.com/Security-Onion-Solutions/securityonion-docs/raw/2.3/images/cheat-sheet/Security-Onion-Cheat-Sheet.pdf - releaseNotesUrl: https://docs.securityonion.net/en/2.3/release-notes + docsUrl: /docs/ + cheatsheetUrl: /docs/cheatsheet.pdf + releaseNotesUrl: /docs/#release-notes apiTimeoutMs: 0 webSocketTimeoutMs: 0 tipTimeoutMs: 0 From deb19d24b86dc980a24a9c58d070bb28be6878db Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Tue, 13 Sep 2022 14:24:35 -0400 Subject: [PATCH 2/2] Always use local docs --- salt/soc/merged.map.jinja | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/salt/soc/merged.map.jinja b/salt/soc/merged.map.jinja index 878ea72e6..09f8c8926 100644 --- a/salt/soc/merged.map.jinja +++ b/salt/soc/merged.map.jinja @@ -21,16 +21,6 @@ {# since cases is not a valid soc config item and only used for the map files, remove it from being placed in the config #} {% do SOCMERGED.server.modules.pop('cases') %} -{# change some options if this is airgap #} -{% if GLOBALS.airgap %} -{% do SOCMERGED.server.client.update({ - 'docsUrl': '/docs/', - 'cheatsheetUrl': '/docs/cheatsheet.pdf', - 'releaseNotesUrl': '/docs/#release-notes' - }) -%} -{% endif %} - {% if pillar.manager.playbook == 0 %} {% do SOCMERGED.server.client.inactiveTools.append('toolPlaybook') %} {% endif %}