SOC Proxy Setting

The so_proxy value we build during install is now copied to SOC's config.

salt/soc/defaults.yaml

@@ -1286,6 +1286,7 @@ soc:
       maxPacketCount: 5000
       htmlDir: html
       importUploadDir: /nsm/soc/uploads
+      proxy: ''
       modules:
         cases: soc
         filedatastore:

salt/soc/merged.map.jinja

@@ -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}) %}