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

only include curl.config if elasticsearch:auth is enabled

Browse Source
This commit is contained in:
m0duspwnens
2022-01-10 11:48:16 -05:00
parent 291ac7d361
commit beb9a33628
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/common/init.sls
View File

@@ -187,6 +187,7 @@ alwaysupdated:
Etc/UTC: Etc/UTC:
timezone.system timezone.system
{% if salt['pillar.get']('elasticsearch:auth:enabled', False) %}
elastic_curl_config: elastic_curl_config:
file.managed: file.managed:
- name: /opt/so/conf/elasticsearch/curl.config - name: /opt/so/conf/elasticsearch/curl.config
@@ -194,9 +195,10 @@ elastic_curl_config:
- mode: 600 - mode: 600
- show_changes: False - show_changes: False
- makedirs: True - 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: - require:
- file: elastic_curl_config_distributed - file: elastic_curl_config_distributed
{% endif %}
{% endif %} {% endif %}
# Sync some Utilities # Sync some Utilities

2
salt/elasticsearch/files/curl.config.template
View File

@@ -1 +1 @@
user = "{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user') }}:{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass') }}" user = "{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user') }}:{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass') }}"

3
salt/manager/elasticsearch.sls
View File

@@ -1,4 +1,4 @@
{% if salt['pillar.get']('elasticsearch:auth:enabled', False) %}
elastic_curl_config_distributed: elastic_curl_config_distributed:
file.managed: file.managed:
- name: /opt/so/saltstack/local/salt/elasticsearch/curl.config - name: /opt/so/saltstack/local/salt/elasticsearch/curl.config
@@ -6,3 +6,4 @@ elastic_curl_config_distributed:
- template: jinja - template: jinja
- mode: 600 - mode: 600
- show_changes: False - show_changes: False
{% endif %}