Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow 2.3 to update #12752

Merged
merged 11 commits into from
Apr 4, 2024
+17 −7
Merged

Allow 2.3 to update #12752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9db9af2
Attempt to fix 2.3 when main repo changes
TOoSmOotH Apr 3, 2024
9c59f42
Attempt to fix 2.3 when main repo changes
TOoSmOotH Apr 3, 2024
12da7db
Attempt to fix 2.3 when main repo changes
TOoSmOotH Apr 3, 2024
14c8241
Attempt to fix 2.3 when main repo changes
TOoSmOotH Apr 4, 2024
4b31632
Attempt to fix 2.3 when main repo changes
TOoSmOotH Apr 4, 2024
d3f163b
Attempt to fix 2.3 when main repo changes
TOoSmOotH Apr 4, 2024
470b0e4
Attempt to fix 2.3 when main repo changes
TOoSmOotH Apr 4, 2024
7668fa1
Attempt to fix 2.3 when main repo changes
TOoSmOotH Apr 4, 2024
c4ebe25
Attempt to fix 2.3 when main repo changes
TOoSmOotH Apr 4, 2024
54fce4b
2.3 updates
TOoSmOotH Apr 4, 2024
784ec54
2.3 updates
TOoSmOotH Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions salt/common/soup_scripts.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{% import_yaml '/opt/so/saltstack/local/pillar/global/soc_global.sls' as SOC_GLOBAL %}
{% if SOC_GLOBAL.global.airgap %}
{% set UPDATE_DIR='/tmp/soagupdate/SecurityOnion' %}
{% else %}
{% set UPDATE_DIR='/tmp/sogh/securityonion' %}
{% endif %}
{% if '2.4' in salt['cp.get_file_str']('/etc/soversion') %}

{% import_yaml '/opt/so/saltstack/local/pillar/global/soc_global.sls' as SOC_GLOBAL %}
{% if SOC_GLOBAL.global.airgap %}
{% set UPDATE_DIR='/tmp/soagupdate/SecurityOnion' %}
{% else %}
{% set UPDATE_DIR='/tmp/sogh/securityonion' %}
{% endif %}

remove_common_soup:
file.absent:
Expand Down Expand Up @@ -75,3 +77,12 @@ copy_so-yaml_sbin:
- source: {{UPDATE_DIR}}/salt/manager/tools/sbin/so-yaml.py
- force: True
- preserve: True

{% else %}
fix_23_soup_sbin:
cmd.run:
- name: curl -s -f -o /usr/sbin/soup https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/2.3/main/salt/common/tools/sbin/soup
fix_23_soup_salt:
cmd.run:
- name: curl -s -f -o /opt/so/saltstack/defalt/salt/common/tools/sbin/soup https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/2.3/main/salt/common/tools/sbin/soup
{% endif %}
1 change: 0 additions & 1 deletion salt/manager/tools/sbin/soup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,6 @@ main() {

echo "### Preparing soup at $(date) ###"
echo ""

set_os

check_salt_master_status 1 || fail "Could not talk to salt master: Please run 'systemctl status salt-master' to ensure the salt-master service is running and check the log at /opt/so/log/salt/master."
Expand Down
Loading