mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-07 01:32:47 +01:00
manager and common states now require elasticsearch.auth state
This commit is contained in:
@@ -3,6 +3,12 @@
|
|||||||
|
|
||||||
{% set role = grains.id.split('_') | last %}
|
{% set role = grains.id.split('_') | last %}
|
||||||
{% from 'elasticsearch/auth.map.jinja' import ELASTICAUTH with context %}
|
{% 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
|
# Remove variables.txt from /tmp - This is temp
|
||||||
rmvariablesfile:
|
rmvariablesfile:
|
||||||
@@ -179,7 +185,10 @@ utilsyncscripts:
|
|||||||
- source: salt://common/tools/sbin
|
- source: salt://common/tools/sbin
|
||||||
- defaults:
|
- defaults:
|
||||||
ELASTICCURL: {{ ELASTICAUTH.elasticcurl }}
|
ELASTICCURL: {{ ELASTICAUTH.elasticcurl }}
|
||||||
|
{% if grains.role in ES_INCLUDED_NODES %}
|
||||||
|
- require:
|
||||||
|
- file: elastic_auth_pillar
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% if role in ['eval', 'standalone', 'sensor', 'heavynode'] %}
|
{% if role in ['eval', 'standalone', 'sensor', 'heavynode'] %}
|
||||||
# Add sensor cleanup
|
# Add sensor cleanup
|
||||||
|
|||||||
@@ -20,6 +20,9 @@
|
|||||||
{% set MANAGER = salt['grains.get']('master') %}
|
{% set MANAGER = salt['grains.get']('master') %}
|
||||||
{% set STRELKA_RULES = salt['pillar.get']('strelka:rules', '1') %}
|
{% set STRELKA_RULES = salt['pillar.get']('strelka:rules', '1') %}
|
||||||
|
|
||||||
|
include:
|
||||||
|
- elasticsearch.auth
|
||||||
|
|
||||||
socore_own_saltstack:
|
socore_own_saltstack:
|
||||||
file.directory:
|
file.directory:
|
||||||
- name: /opt/so/saltstack
|
- name: /opt/so/saltstack
|
||||||
|
|||||||
Reference in New Issue
Block a user