CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14719 from Security-Onion-Solutions/2.4/playbookairgap

Browse Source 
Airgap tweaks
This commit is contained in:
Josh Brower
2025-06-06 17:52:08 -04:00
committed by GitHub
parent 350e1c9d91 b428573a0a
commit b9ea151846
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
salt/manager/init.sls
View File

@@ -156,6 +156,13 @@ rules_dir:
- group: socore - group: socore
- makedirs: True - makedirs: True
nsm_playbooks_dir:
file.directory:
- name: /nsm/airgap-resources/playbooks
- user: socore
- group: socore
- makedirs: True
git_config_set_safe_dirs: git_config_set_safe_dirs:
git.config_set: git.config_set:
- name: safe.directory - name: safe.directory
@@ -166,6 +173,8 @@ git_config_set_safe_dirs:
- /nsm/rules/custom-local-repos/local-yara - /nsm/rules/custom-local-repos/local-yara
- /nsm/securityonion-resources - /nsm/securityonion-resources
- /opt/so/conf/soc/ai_summary_repos/securityonion-resources - /opt/so/conf/soc/ai_summary_repos/securityonion-resources
- /nsm/airgap-resources/playbooks
- /opt/so/conf/soc/playbooks
{% else %} {% else %}
{{sls}}_state_not_allowed: {{sls}}_state_not_allowed:

3
salt/manager/tools/sbin/soup
View File

@@ -1071,7 +1071,7 @@ update_airgap_rules() {
update_airgap_playbooks() { update_airgap_playbooks() {
# Copy the playbooks over to update them for airgap. # Copy the playbooks over to update them for airgap.
rsync -a --delete --chown=socore:socore $UPDATE_DIR/airgap-resources/playbooks/* /nsm/airgap-resources/playbooks/ rsync -a --delete --chown=socore:socore $UPDATE_DIR/airgap-resources/playbooks/ /nsm/airgap-resources/playbooks/
} }
update_airgap_repo() { update_airgap_repo() {
@@ -1258,7 +1258,6 @@ apply_hotfix() {
elif [[ "$INSTALLEDVERSION" == "2.4.30" ]] ; then elif [[ "$INSTALLEDVERSION" == "2.4.30" ]] ; then
if [[ $is_airgap -eq 0 ]]; then if [[ $is_airgap -eq 0 ]]; then
update_airgap_rules update_airgap_rules
update_airgap_playbooks
fi fi
if [[ -f /etc/pki/managerssl.key.old ]]; then if [[ -f /etc/pki/managerssl.key.old ]]; then
echo "Skipping Certificate Generation" echo "Skipping Certificate Generation"