From e85c3e5b27b026238d7ebf9bb39f23f2aa6fc97a Mon Sep 17 00:00:00 2001
From: Corey Ogburn <corey.ogburn@securityonionsolutions.com>
Date: Wed, 5 Jun 2024 14:45:06 -0600
Subject: [PATCH 1/2] SOC Proxy Setting

The so_proxy value we build during install is now copied to SOC's config.
---
 salt/soc/defaults.yaml    | 1 +
 salt/soc/merged.map.jinja | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/salt/soc/defaults.yaml b/salt/soc/defaults.yaml
index f5628f3c3e..65fb450d9f 100644
--- a/salt/soc/defaults.yaml
+++ b/salt/soc/defaults.yaml
@@ -1286,6 +1286,7 @@ soc:
       maxPacketCount: 5000
       htmlDir: html
       importUploadDir: /nsm/soc/uploads
+      proxy: ''
       modules:
         cases: soc
         filedatastore:
diff --git a/salt/soc/merged.map.jinja b/salt/soc/merged.map.jinja
index f2c88fde98..4ee0eea1ec 100644
--- a/salt/soc/merged.map.jinja
+++ b/salt/soc/merged.map.jinja
@@ -1,5 +1,5 @@
 {# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
-   or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
+   or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at
    https://securityonion.net/license; you may not use this file except in compliance with the
    Elastic License 2.0. #}
 
@@ -11,6 +11,9 @@
 
 {% set SOCMERGED = salt['pillar.get']('soc', SOCDEFAULTS, merge=true) %}
 
+{% set MANAGER_PROXY = salt['pillar.get']('manager:proxy', '') %}
+{% do SOCMERGED.config.server.update({'proxy': MANAGER_PROXY}) %}
+
 {# if SOCMERGED.config.server.modules.cases == httpcase details come from the soc pillar #}
 {% if SOCMERGED.config.server.modules.cases != 'soc' %}
 {%   do SOCMERGED.config.server.modules.elastic.update({'casesEnabled': false}) %}

From 42818a9950bb7832e08099aa243fcafd71c8f75f Mon Sep 17 00:00:00 2001
From: Corey Ogburn <corey.ogburn@securityonionsolutions.com>
Date: Thu, 6 Jun 2024 13:28:07 -0600
Subject: [PATCH 2/2] Remove proxy from SOC defaults

---
 salt/soc/defaults.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/salt/soc/defaults.yaml b/salt/soc/defaults.yaml
index 65fb450d9f..f5628f3c3e 100644
--- a/salt/soc/defaults.yaml
+++ b/salt/soc/defaults.yaml
@@ -1286,7 +1286,6 @@ soc:
       maxPacketCount: 5000
       htmlDir: html
       importUploadDir: /nsm/soc/uploads
-      proxy: ''
       modules:
         cases: soc
         filedatastore: