From beb9a33628d66ca883b6e2fd0a0fc5b30548d125 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Mon, 10 Jan 2022 11:48:16 -0500
Subject: [PATCH] only include curl.config if elasticsearch:auth is enabled

---
 salt/common/init.sls                          | 4 +++-
 salt/elasticsearch/files/curl.config.template | 2 +-
 salt/manager/elasticsearch.sls                | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/salt/common/init.sls b/salt/common/init.sls
index 8824a2df9..e511308a7 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -187,6 +187,7 @@ alwaysupdated:
 Etc/UTC:
   timezone.system
 
+{% if salt['pillar.get']('elasticsearch:auth:enabled', False) %}
 elastic_curl_config:
   file.managed:
     - name: /opt/so/conf/elasticsearch/curl.config
@@ -194,9 +195,10 @@ elastic_curl_config:
     - mode: 600
     - show_changes: False
     - makedirs: True
-{% if grains.role in ['so-eval', 'so-manager', 'so-standalone', 'so-managersearch', 'so-import'] %}
+  {% if grains.role in ['so-eval', 'so-manager', 'so-standalone', 'so-managersearch', 'so-import'] %}
     - require:
       - file: elastic_curl_config_distributed
+  {% endif %}
 {% endif %}
 
 # Sync some Utilities
diff --git a/salt/elasticsearch/files/curl.config.template b/salt/elasticsearch/files/curl.config.template
index 14f5a2a1d..514eeaf65 100644
--- a/salt/elasticsearch/files/curl.config.template
+++ b/salt/elasticsearch/files/curl.config.template
@@ -1 +1 @@
-user = "{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user') }}:{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass') }}"
\ No newline at end of file
+user = "{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user') }}:{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass') }}"
diff --git a/salt/manager/elasticsearch.sls b/salt/manager/elasticsearch.sls
index 63f2dccdc..24c509fb4 100644
--- a/salt/manager/elasticsearch.sls
+++ b/salt/manager/elasticsearch.sls
@@ -1,4 +1,4 @@
-
+{% if salt['pillar.get']('elasticsearch:auth:enabled', False) %}
 elastic_curl_config_distributed:
   file.managed:
     - name: /opt/so/saltstack/local/salt/elasticsearch/curl.config
@@ -6,3 +6,4 @@ elastic_curl_config_distributed:
     - template: jinja
     - mode: 600
     - show_changes: False
+{% endif %}