From edf60f80f707b5c65b853d87f49b9652c6a5d117 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 28 May 2021 15:26:26 -0400
Subject: [PATCH] manager and common states now require elasticsearch.auth
 state

---
 salt/common/init.sls  | 11 ++++++++++-
 salt/manager/init.sls |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/salt/common/init.sls b/salt/common/init.sls
index d61806a1a..33c1f28df 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -3,6 +3,12 @@
 
 {% set role = grains.id.split('_') | last %}
 {% from 'elasticsearch/auth.map.jinja' import ELASTICAUTH with context %}
+{% set ES_INCLUDED_NODES = ['so-standalone'] %}
+
+{% if grains.role in ES_INCLUDED_NODES %}
+include:
+  - elasticsearch.auth
+{% %}
 
 # Remove variables.txt from /tmp - This is temp
 rmvariablesfile:
@@ -179,7 +185,10 @@ utilsyncscripts:
     - source: salt://common/tools/sbin
     - defaults:
         ELASTICCURL: {{ ELASTICAUTH.elasticcurl }}
-
+{% if grains.role in ES_INCLUDED_NODES %}
+    - require:
+      - file: elastic_auth_pillar
+{% endif %}
 
 {% if role in ['eval', 'standalone', 'sensor', 'heavynode'] %}
 # Add sensor cleanup
diff --git a/salt/manager/init.sls b/salt/manager/init.sls
index 91635eb59..91be3136f 100644
--- a/salt/manager/init.sls
+++ b/salt/manager/init.sls
@@ -20,6 +20,9 @@
 {% set MANAGER = salt['grains.get']('master') %}
 {% set STRELKA_RULES = salt['pillar.get']('strelka:rules', '1') %}
 
+include:
+  - elasticsearch.auth
+
 socore_own_saltstack:
   file.directory:
     - name: /opt/so/saltstack