santerikainulainen/ansible-role-elasticsearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged change

Browse source
This commit is contained in:
Jeffrey Everling 2018-05-05 08:05:14 +02:00
parent e880cdf61f
commit 8cfa0cfd04
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
templates/elasticsearch.yml.j2
View file

@ -27,9 +27,6 @@ path.logs: {{ log_dir }}
path.repo: {{ es_path_repo }} path.repo: {{ es_path_repo }}
{% endif %} {% endif %}
<<<<<<< HEAD
action.auto_create_index: {{ action_auto_create_index }}
=======
{% if es_action_auto_create_index == true %} {% if es_action_auto_create_index == true %}
action.auto_create_index: true action.auto_create_index: true
{% elif not es_action_auto_create_index %} {% elif not es_action_auto_create_index %}
@ -37,7 +34,6 @@ action.auto_create_index: false
{% else %} {% else %}
action.auto_create_index: {{ es_action_auto_create_index }} action.auto_create_index: {{ es_action_auto_create_index }}
{% endif %} {% endif %}
>>>>>>> da527ec... Added support for providing an array with indices
{% if es_enable_xpack %} {% if es_enable_xpack %}
{% if not "security" in es_xpack_features %} {% if not "security" in es_xpack_features %}