CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

update auth.map and curl.config to use new elasticsearch:auth pillar format

Browse Source
This commit is contained in:
m0duspwnens
2021-05-28 14:03:21 -04:00
parent 63b31de2b8
commit 68abaa5e3c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/elasticsearch/auth.map.jinja
View File

@@ -1,7 +1,7 @@
{% set ELASTICAUTH = salt['pillar.filter_by']({ {% set ELASTICAUTH = salt['pillar.filter_by']({
True: { True: {
'user': salt['pillar.get']('elasticsearch:auth:user'), 'user': salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user'),
'pass': salt['pillar.get']('elasticsearch:auth:pass'), 'pass': salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass'),
'elasticcurl':'curl -K /opt/so/conf/elasticsearch/curl.config' }, 'elasticcurl':'curl -K /opt/so/conf/elasticsearch/curl.config' },
False: {'elasticcurl': 'curl'}, False: {'elasticcurl': 'curl'},
}, pillar='elasticsearch:auth:enabled', default=False) %} }, pillar='elasticsearch:auth:enabled', default=False) %}

2
salt/elasticsearch/init.sls
View File

@@ -293,7 +293,7 @@ elastic_curl_config:
file.managed: file.managed:
- name: /opt/so/conf/elasticsearch/curl.config - name: /opt/so/conf/elasticsearch/curl.config
- mode: 600 - 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 - show_changes: False
{% endif %} {# if grains['role'] != 'so-helix' #} {% endif %} {# if grains['role'] != 'so-helix' #}