Merge branch 'master' into AddSSLSupport

This commit is contained in:
Nathan Young 2019-10-11 23:09:03 +01:00
commit 551d93b646
No known key found for this signature in database
GPG key ID: EB5E14327B10D023
25 changed files with 171 additions and 246 deletions

View file

@ -15,10 +15,6 @@ node.name: {{inventory_hostname}}
# Path to directory containing configuration (this file and logging.yml):
{% if (es_version is version_compare('6.0.0', '<')) %}
path.conf: {{ es_conf_dir }}
{% endif %}
path.data: {{ es_data_dirs | array_to_str }}
path.logs: {{ es_log_dir }}