From 79470cb344946666c918261dac538ca6a9eac7ec Mon Sep 17 00:00:00 2001
From: Julien Mailleret <julien.mailleret@elastic.co>
Date: Wed, 18 Sep 2019 10:04:50 +0200
Subject: [PATCH] replace hardcoded /etc/elasticsearch dir by the good variable

---
 tasks/elasticsearch-Debian.yml   | 4 ++--
 tasks/elasticsearch-RedHat.yml   | 2 +-
 tasks/elasticsearch-template.yml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml
index 4f6844b..5fc4a7a 100644
--- a/tasks/elasticsearch-Debian.yml
+++ b/tasks/elasticsearch-Debian.yml
@@ -92,7 +92,7 @@
   register: debian_elasticsearch_install_from_repo
   notify: restart elasticsearch
   environment:
-    ES_PATH_CONF: "/etc/elasticsearch"
+    ES_PATH_CONF: "{{ es_conf_dir }}"
 
 - name: Debian - hold elasticsearch version
   become: yes
@@ -112,4 +112,4 @@
   register: elasticsearch_install_from_package
   notify: restart elasticsearch
   environment:
-    ES_PATH_CONF: "/etc/elasticsearch"
+    ES_PATH_CONF: "{{ es_conf_dir }}"
diff --git a/tasks/elasticsearch-RedHat.yml b/tasks/elasticsearch-RedHat.yml
index 1208b1c..a7b974d 100644
--- a/tasks/elasticsearch-RedHat.yml
+++ b/tasks/elasticsearch-RedHat.yml
@@ -52,7 +52,7 @@
   retries: 5
   delay: 10
   environment:
-    ES_PATH_CONF: "/etc/elasticsearch"
+    ES_PATH_CONF: "{{ es_conf_dir }}"
 
 - name: RedHat - Install Elasticsearch from url
   become: yes
diff --git a/tasks/elasticsearch-template.yml b/tasks/elasticsearch-template.yml
index 8af780d..beb512e 100644
--- a/tasks/elasticsearch-template.yml
+++ b/tasks/elasticsearch-template.yml
@@ -2,13 +2,13 @@
 
 - name: ensure templates dir is created
   file:
-    path: /etc/elasticsearch/templates
+    path: "{{ es_conf_dir }}/templates"
     state: directory
     owner: "{{ es_user }}"
     group: "{{ es_group }}"
 
 - name: Copy templates to elasticsearch
-  copy: src={{ item }} dest=/etc/elasticsearch/templates owner={{ es_user }} group={{ es_group }}
+  copy: src={{ item }} dest={{ es_conf_dir }}/templates owner={{ es_user }} group={{ es_group }}
   register: load_templates
   with_fileglob:
     - "{{ es_templates_fileglob | default('') }}"