From 68abaa5e3c6c3efa873a2db6fa617c470a5abcf2 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 28 May 2021 14:03:21 -0400
Subject: [PATCH] update auth.map and curl.config to use new elasticsearch:auth
 pillar format

---
 salt/elasticsearch/auth.map.jinja | 4 ++--
 salt/elasticsearch/init.sls       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/salt/elasticsearch/auth.map.jinja b/salt/elasticsearch/auth.map.jinja
index c6f099025..3c3b42cdc 100644
--- a/salt/elasticsearch/auth.map.jinja
+++ b/salt/elasticsearch/auth.map.jinja
@@ -1,7 +1,7 @@
 {% set ELASTICAUTH = salt['pillar.filter_by']({
     True: {
-      'user': salt['pillar.get']('elasticsearch:auth:user'), 
-      'pass': salt['pillar.get']('elasticsearch:auth:pass'), 
+      'user': salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user'), 
+      'pass': salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass'), 
       'elasticcurl':'curl -K /opt/so/conf/elasticsearch/curl.config' },
     False: {'elasticcurl': 'curl'},
 }, pillar='elasticsearch:auth:enabled', default=False) %}
diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 7f287fa27..fb2927e99 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -293,7 +293,7 @@ elastic_curl_config:
   file.managed:
     - name: /opt/so/conf/elasticsearch/curl.config
     - mode: 600
-    - contents: user = "{{ salt['pillar.get']('elasticsearch:auth:user') }}:{{ salt['pillar.get']('elasticsearch:auth:pass') }}"
+    - contents: user = "{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user') }}:{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass') }}"
     - show_changes: False
 
 {% endif %} {# if grains['role'] != 'so-helix' #}