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

Merge pull request #6998 from Security-Onion-Solutions/es_binds

Browse Source 
mount repo dir in container same as defined on host
This commit is contained in:
Josh Patterson
2022-01-26 13:59:17 -05:00
committed by GitHub
parent e77648c475 c80adc0430
commit 4f30d43611
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
salt/elasticsearch/config.map.jinja
View File

@@ -36,11 +36,10 @@
{# merge with the elasticsearch pillar #} {# merge with the elasticsearch pillar #}
{% set ESCONFIG = salt['pillar.get']('elasticsearch:config', default=ESCONFIG.elasticsearch.config, merge=True) %} {% set ESCONFIG = salt['pillar.get']('elasticsearch:config', default=ESCONFIG.elasticsearch.config, merge=True) %}
{# remove elasticsearch.config.path.repo values if a symlink /nsm/elasticsearch/repo{{ repo }} doesn't exist #}
{% if salt['pillar.get']('elasticsearch:config:path:repo', False) %} {% if salt['pillar.get']('elasticsearch:config:path:repo', False) %}
{% for repo in pillar.elasticsearch.config.path.repo %} {% for repo in pillar.elasticsearch.config.path.repo %}
{# retcode is 1 if symlink doesn't exist #} {# remove elasticsearch.config.path.repo value if the directory doesn't exist on the node #}
{% if salt['cmd.retcode']('test -L /nsm/elasticsearch/repo'~repo) %} {% if not salt['file.directory_exists'](repo) %}
{% do ESCONFIG.path.repo.remove(repo) %} {% do ESCONFIG.path.repo.remove(repo) %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}

2
salt/elasticsearch/init.sls
View File

@@ -326,7 +326,7 @@ so-elasticsearch:
{% endif %} {% endif %}
{% if ESCONFIG.path.get('repo', False) %} {% if ESCONFIG.path.get('repo', False) %}
{% for repo in ESCONFIG.path.repo %} {% for repo in ESCONFIG.path.repo %}
- /nsm/elasticsearch/repo{{ repo }}:{{ repo }}:rw - {{ repo }}:{{ repo }}:rw
{% endfor %} {% endfor %}
{% endif %} {% endif %}
- watch: - watch: