From 05a81596e52931a856fe6fd790fa5564efc7e9a2 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 12 May 2023 14:38:39 -0400
Subject: [PATCH] place and access sensoronikey from sensoroni.config

---
 salt/soc/defaults.map.jinja | 2 +-
 setup/so-functions          | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/salt/soc/defaults.map.jinja b/salt/soc/defaults.map.jinja
index 9b9606cf2..d816752c0 100644
--- a/salt/soc/defaults.map.jinja
+++ b/salt/soc/defaults.map.jinja
@@ -30,7 +30,7 @@
 {%   endif %}
 {% endfor %}
 
-{% do SOCDEFAULTS.soc.config.server.modules.statickeyauth.update({'anonymousCidr': DOCKER.sorange, 'apiKey': pillar.sensoroni.sensoronikey}) %}
+{% do SOCDEFAULTS.soc.config.server.modules.statickeyauth.update({'anonymousCidr': DOCKER.sorange, 'apiKey': pillar.sensoroni.config.sensoronikey}) %}
 
 {% do SOCDEFAULTS.soc.config.server.client.case.update({'analyzerNodeId': GLOBALS.hostname}) %}
 
diff --git a/setup/so-functions b/setup/so-functions
index 992e7f2cb..a51af57b1 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1496,9 +1496,10 @@ create_sensoroni_pillar() {
 	
 	printf '%s\n'\
 		"sensoroni:"\
-		"  node_checkin_interval_ms: $NODE_CHECKIN_INTERVAL_MS"\
-		"  sensoronikey: '$SENSORONIKEY'"\
-		"  soc_host: '$REDIRECTIT'" > $sensoroni_pillar_file
+		"  config:"\
+		"    node_checkin_interval_ms: $NODE_CHECKIN_INTERVAL_MS"\
+		"    sensoronikey: '$SENSORONIKEY'"\
+		"    soc_host: '$REDIRECTIT'" > $sensoroni_pillar_file
 
 }