From bbcbd02fd63bf76a27c6c5fc57643000096f57ee Mon Sep 17 00:00:00 2001
From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com>
Date: Mon, 13 Jul 2020 16:47:33 +0200
Subject: [PATCH 1/3] Avoid sudo on local_actions

---
 .../opendistro-elasticsearch/tasks/local_actions.yml          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/local_actions.yml b/roles/opendistro/opendistro-elasticsearch/tasks/local_actions.yml
index 463263a5..3c89e6ab 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/local_actions.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/local_actions.yml
@@ -4,6 +4,7 @@
     path: "{{ local_certs_path }}"
   register: certificates_folder
   delegate_to: localhost
+  become: no
   tags:
     - generate-certs
 
@@ -77,7 +78,8 @@
 
   run_once: true
   delegate_to: localhost
+  become: no
   tags:
     - generate-certs
   when:
-    - not certificates_folder.stat.exists
\ No newline at end of file
+    - not certificates_folder.stat.exists

From 6443e3a08cd362dd128f2c40f4655d1e88273507 Mon Sep 17 00:00:00 2001
From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com>
Date: Tue, 14 Jul 2020 12:34:27 +0200
Subject: [PATCH 2/3] Use explicit path for kibana.yml

---
 roles/opendistro/opendistro-kibana/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 roles/opendistro/opendistro-kibana/tasks/main.yml

diff --git a/roles/opendistro/opendistro-kibana/tasks/main.yml b/roles/opendistro/opendistro-kibana/tasks/main.yml
old mode 100644
new mode 100755
index d6a27c5a..bab044b9
--- a/roles/opendistro/opendistro-kibana/tasks/main.yml
+++ b/roles/opendistro/opendistro-kibana/tasks/main.yml
@@ -75,7 +75,7 @@
     - not build_from_sources
 
 - name: Kibana optimization (can take a while)
-  shell: /usr/share/kibana/node/bin/node {{ node_options }} /usr/share/kibana/src/cli --optimize
+  shell: /usr/share/kibana/node/bin/node {{ node_options }} /usr/share/kibana/src/cli --optimize -c {{ kibana_conf_path }}/kibana.yml
   args:
     executable: /bin/bash
   become: yes

From f51b55860b9eaa538f7f1cb8686d05b5a34a95f9 Mon Sep 17 00:00:00 2001
From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com>
Date: Mon, 13 Jul 2020 20:57:51 +0200
Subject: [PATCH 3/3] Use single variable for opendistro version

---
 roles/opendistro/opendistro-kibana/defaults/main.yml | 1 -
 roles/opendistro/opendistro-kibana/tasks/main.yml    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/roles/opendistro/opendistro-kibana/defaults/main.yml b/roles/opendistro/opendistro-kibana/defaults/main.yml
index 8e676e15..9c054a38 100644
--- a/roles/opendistro/opendistro-kibana/defaults/main.yml
+++ b/roles/opendistro/opendistro-kibana/defaults/main.yml
@@ -20,7 +20,6 @@ wazuh_app_url: https://packages.wazuh.com/wazuhapp/wazuhapp
 
 # The OpenDistro package repository
 kibana_opendistro_version: -1.8.0-1 # Version includes the - for RedHat family compatibility, replace with = for Debian hosts
-kibana_opendistro_package: "opendistroforelasticsearch-kibana{{ kibana_opendistro_version }}"
 
 package_repos:
   yum:
diff --git a/roles/opendistro/opendistro-kibana/tasks/main.yml b/roles/opendistro/opendistro-kibana/tasks/main.yml
index bab044b9..006b7cd7 100755
--- a/roles/opendistro/opendistro-kibana/tasks/main.yml
+++ b/roles/opendistro/opendistro-kibana/tasks/main.yml
@@ -23,7 +23,7 @@
 
 - name: Install Kibana
   package:
-    name: "{{ kibana_opendistro_package }}"
+    name: "opendistroforelasticsearch-kibana{{ kibana_opendistro_version }}"
     state: present
   register: install
   tags: install
@@ -130,4 +130,4 @@
     state: started
 
 - import_tasks: RMRedHat.yml
-  when: ansible_os_family == 'RedHat'
\ No newline at end of file
+  when: ansible_os_family == 'RedHat'