From 9db9af27aed759eaceeaf0132608c8fc4e2d0c97 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 3 Apr 2024 15:14:50 -0400 Subject: [PATCH 01/10] Attempt to fix 2.3 when main repo changes --- salt/manager/tools/sbin/soup | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index a585f877c7..9e972b4bc4 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -837,7 +837,16 @@ main() { echo "### Preparing soup at $(date) ###" echo "" - + if [[ "$INSTALLEDVERISON" =~ ^2.3.* ]]; then + BRANCH="2.3/main" + cd $UPDATE_DIR + clone_to_tmp + cp $UPDATE_DIR/salt/common/tools/sbin/soup /usr/sbin + cp $UPDATE_DIR/salt/common/tools/sbin/soup /opt/so/saltstack/default/salt/common/tools/sbin + add_common + echo "Please run soup again" + exit 0 + fi 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." From 9c59f42c16a9232abf1e6de8f03c941f617a46bd Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 3 Apr 2024 15:23:09 -0400 Subject: [PATCH 02/10] Attempt to fix 2.3 when main repo changes --- salt/manager/tools/sbin/soup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 9e972b4bc4..fd5ee8ead4 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -841,8 +841,8 @@ main() { BRANCH="2.3/main" cd $UPDATE_DIR clone_to_tmp - cp $UPDATE_DIR/salt/common/tools/sbin/soup /usr/sbin - cp $UPDATE_DIR/salt/common/tools/sbin/soup /opt/so/saltstack/default/salt/common/tools/sbin + cp $UPDATE_DIR/securityonion/salt/common/tools/sbin/soup /usr/sbin + cp $UPDATE_DIR/securityonion/salt/common/tools/sbin/soup /opt/so/saltstack/default/salt/common/tools/sbin add_common echo "Please run soup again" exit 0 From 12da7db22c57744a73d48b6028823c98491c5ec0 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 3 Apr 2024 15:38:23 -0400 Subject: [PATCH 03/10] Attempt to fix 2.3 when main repo changes --- salt/manager/tools/sbin/soup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index fd5ee8ead4..cbe3d461a0 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -837,7 +837,8 @@ main() { echo "### Preparing soup at $(date) ###" echo "" - if [[ "$INSTALLEDVERISON" =~ ^2.3.* ]]; then + if [[ "$INSTALLEDVERSION" =~ ^2.3 ]]; then + echo "Actually running the code" BRANCH="2.3/main" cd $UPDATE_DIR clone_to_tmp From 14c824143bfb821f1b553fa24d68605c15461556 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 4 Apr 2024 08:48:44 -0400 Subject: [PATCH 04/10] Attempt to fix 2.3 when main repo changes --- salt/common/soup_scripts.sls | 7 +++++++ salt/manager/tools/sbin/soup | 11 ----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls index fd32b8a286..99358a1a16 100644 --- a/salt/common/soup_scripts.sls +++ b/salt/common/soup_scripts.sls @@ -1,3 +1,5 @@ +{% 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' %} @@ -68,3 +70,8 @@ copy_so-firewall_sbin: - source: {{UPDATE_DIR}}/salt/manager/tools/sbin/so-firewall - force: True - preserve: True +{% else %} +fix_old_versions: + cmd.run: + - name: BRANCH=2.3/main soup -y +{% endif %} \ No newline at end of file diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index cbe3d461a0..a4343faf44 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -837,17 +837,6 @@ main() { echo "### Preparing soup at $(date) ###" echo "" - if [[ "$INSTALLEDVERSION" =~ ^2.3 ]]; then - echo "Actually running the code" - BRANCH="2.3/main" - cd $UPDATE_DIR - clone_to_tmp - cp $UPDATE_DIR/securityonion/salt/common/tools/sbin/soup /usr/sbin - cp $UPDATE_DIR/securityonion/salt/common/tools/sbin/soup /opt/so/saltstack/default/salt/common/tools/sbin - add_common - echo "Please run soup again" - exit 0 - fi 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." From 4b31632dfc3764773763c2808ccec802520eeee6 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 4 Apr 2024 08:52:37 -0400 Subject: [PATCH 05/10] Attempt to fix 2.3 when main repo changes --- salt/common/soup_scripts.sls | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls index 99358a1a16..da1f5199b2 100644 --- a/salt/common/soup_scripts.sls +++ b/salt/common/soup_scripts.sls @@ -73,5 +73,6 @@ copy_so-firewall_sbin: {% else %} fix_old_versions: cmd.run: - - name: BRANCH=2.3/main soup -y + - env: BRANCH=2.3/main + - name: soup -y {% endif %} \ No newline at end of file From d3f163bf9e1e46c9baa075a8cbaa73479edb9aa4 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 4 Apr 2024 08:54:04 -0400 Subject: [PATCH 06/10] Attempt to fix 2.3 when main repo changes --- salt/common/soup_scripts.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls index da1f5199b2..c8489ac64f 100644 --- a/salt/common/soup_scripts.sls +++ b/salt/common/soup_scripts.sls @@ -73,6 +73,6 @@ copy_so-firewall_sbin: {% else %} fix_old_versions: cmd.run: - - env: BRANCH=2.3/main + - env: "BRANCH=2.3/main" - name: soup -y {% endif %} \ No newline at end of file From 470b0e4bf68415835f2b2c0f5e2b311ba120425c Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 4 Apr 2024 08:55:13 -0400 Subject: [PATCH 07/10] Attempt to fix 2.3 when main repo changes --- salt/common/soup_scripts.sls | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls index c8489ac64f..fe378c38f1 100644 --- a/salt/common/soup_scripts.sls +++ b/salt/common/soup_scripts.sls @@ -73,6 +73,7 @@ copy_so-firewall_sbin: {% else %} fix_old_versions: cmd.run: - - env: "BRANCH=2.3/main" + - env: + - BRANCH: "2.3/main" - name: soup -y {% endif %} \ No newline at end of file From 7668fa1396dce0757e370d6e8ef0448a0f18a13c Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 4 Apr 2024 09:03:29 -0400 Subject: [PATCH 08/10] Attempt to fix 2.3 when main repo changes --- salt/common/soup_scripts.sls | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls index fe378c38f1..f36ddf47ba 100644 --- a/salt/common/soup_scripts.sls +++ b/salt/common/soup_scripts.sls @@ -71,9 +71,10 @@ copy_so-firewall_sbin: - force: True - preserve: True {% else %} -fix_old_versions: +fix_23_soup_sbin: cmd.run: - - env: - - BRANCH: "2.3/main" - - name: soup -y + - name: curl -s -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 -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 %} \ No newline at end of file From c4ebe25bab42761482c63461344cee10ae35f703 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 4 Apr 2024 09:18:37 -0400 Subject: [PATCH 09/10] Attempt to fix 2.3 when main repo changes --- salt/common/soup_scripts.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls index f36ddf47ba..e86edfad1a 100644 --- a/salt/common/soup_scripts.sls +++ b/salt/common/soup_scripts.sls @@ -73,8 +73,8 @@ copy_so-firewall_sbin: {% else %} fix_23_soup_sbin: cmd.run: - - name: curl -s -o /usr/sbin/soup https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/2.3/main/salt/common/tools/sbin/soup + - 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 -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 + - 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 %} \ No newline at end of file From 784ec54795008dd2f37aaedee364fc946e3de586 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 4 Apr 2024 09:24:17 -0400 Subject: [PATCH 10/10] 2.3 updates --- salt/common/soup_scripts.sls | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls index d0f8589a07..90ee059a4b 100644 --- a/salt/common/soup_scripts.sls +++ b/salt/common/soup_scripts.sls @@ -1,11 +1,11 @@ {% 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 %} +{% 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: