From 0741be36a6389b33ed9dab74b8ecca470bafdd74 Mon Sep 17 00:00:00 2001
From: d-malko <denismalkomail@gmail.com>
Date: Mon, 29 Mar 2021 10:15:47 +0300
Subject: [PATCH 1/2] Use localhost for elasticsearch and filebeat on single
 node setup.

---
 playbooks/wazuh-odfe-single.yml                       | 11 ++++++++---
 .../opendistro-elasticsearch/tasks/main.yml           |  4 ++--
 .../tasks/security_actions.yml                        |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/playbooks/wazuh-odfe-single.yml b/playbooks/wazuh-odfe-single.yml
index ce98cfaf..569876d6 100644
--- a/playbooks/wazuh-odfe-single.yml
+++ b/playbooks/wazuh-odfe-single.yml
@@ -12,10 +12,15 @@
       single_node: true
       minimum_master_nodes: 1
       elasticsearch_node_master: true
-      elasticsearch_network_host: <your server host>
+      elasticsearch_network_host:  127.0.0.1
       filebeat_node_name: node-1
-      filebeat_output_elasticsearch_hosts: <your server host>
+      filebeat_output_elasticsearch_hosts:  127.0.0.1
       instances:
         node1:
           name: node-1       # Important: must be equal to elasticsearch_node_name.
-          ip: <your server host>
\ No newline at end of file
+          ip: 127.0.0.1
+      elasticsearch_security_password: "<Your password here"
+      opendistro_admin_password: "{{ elasticsearch_security_password }}"
+      opendistro_kibana_password:  "{{ opendistro_admin_password }}"
+      elasticsearch_xpack_security_password: "{{ elasticsearch_security_password }}"
+
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
index b7c962ed..d9830865 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
@@ -57,7 +57,7 @@
 
     - name: Wait for Elasticsearch API
       uri:
-        url: "https://{{ inventory_hostname }}:{{ opendistro_http_port }}/_cluster/health/"
+        url: "https://{{ inventory_hostname if not single_node else elasticsearch_network_host }}:{{ opendistro_http_port }}/_cluster/health/"
         user: "admin" # Default OpenDistro user is always "admin"
         password: "{{ opendistro_admin_password }}"
         validate_certs: no
@@ -76,7 +76,7 @@
 
     - name: Wait for Elasticsearch API (Private IP)
       uri:
-        url: "https://{{ hostvars[inventory_hostname]['private_ip'] }}:{{ opendistro_http_port }}/_cluster/health/"
+        url: "https://{{ hostvars[inventory_hostname]['private_ip'] if not single_node else elasticsearch_network_host }}:{{ opendistro_http_port }}/_cluster/health/"
         user: "admin" # Default OpenDistro user is always "admin"
         password: "{{ opendistro_admin_password }}"
         validate_certs: no
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/security_actions.yml b/roles/opendistro/opendistro-elasticsearch/tasks/security_actions.yml
index e09bdf96..56d13ae9 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/security_actions.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/security_actions.yml
@@ -10,13 +10,13 @@
 
 - name: Configure IP (Private address)
   set_fact:
-    target_address: "{{ hostvars[inventory_hostname]['private_ip'] }}"
+    target_address: "{{ hostvars[inventory_hostname]['private_ip'] if not single_node else elasticsearch_network_host }}"
   when:
     - hostvars[inventory_hostname]['private_ip'] is defined
 
 - name: Configure IP (Public address)
   set_fact:
-    target_address: "{{ inventory_hostname }}"
+    target_address: "{{ inventory_hostname if not single_node else elasticsearch_network_host }}"
   when:
     - hostvars[inventory_hostname]['private_ip'] is not defined
 

From bc5dd49ce9e7c976118950d15d818742cd094140 Mon Sep 17 00:00:00 2001
From: d-malko <denismalkomail@gmail.com>
Date: Wed, 31 Mar 2021 13:08:28 +0300
Subject: [PATCH 2/2] Remove password variables

---
 playbooks/wazuh-odfe-single.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/playbooks/wazuh-odfe-single.yml b/playbooks/wazuh-odfe-single.yml
index 569876d6..33f3a586 100644
--- a/playbooks/wazuh-odfe-single.yml
+++ b/playbooks/wazuh-odfe-single.yml
@@ -19,8 +19,3 @@
         node1:
           name: node-1       # Important: must be equal to elasticsearch_node_name.
           ip: 127.0.0.1
-      elasticsearch_security_password: "<Your password here"
-      opendistro_admin_password: "{{ elasticsearch_security_password }}"
-      opendistro_kibana_password:  "{{ opendistro_admin_password }}"
-      elasticsearch_xpack_security_password: "{{ elasticsearch_security_password }}"
-