From eb133c47202a49ee72969fabd5617ab9987ffa45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Wed, 23 Mar 2022 10:41:14 -0300
Subject: [PATCH] Certs generation command update

---
 .../wazuh/ansible-filebeat-oss/tasks/security_actions.yml | 2 +-
 roles/wazuh/wazuh-dashboard/tasks/security_actions.yml    | 2 +-
 roles/wazuh/wazuh-indexer/tasks/local_actions.yml         | 8 ++++----
 roles/wazuh/wazuh-indexer/tasks/security_actions.yml      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/wazuh/ansible-filebeat-oss/tasks/security_actions.yml b/roles/wazuh/ansible-filebeat-oss/tasks/security_actions.yml
index 795c0c96..c9b90070 100644
--- a/roles/wazuh/ansible-filebeat-oss/tasks/security_actions.yml
+++ b/roles/wazuh/ansible-filebeat-oss/tasks/security_actions.yml
@@ -10,7 +10,7 @@
 
   - name: Copy the certificates from local to the Manager instance
     copy:
-      src: "{{ local_certs_path }}/certs/{{ item }}"
+      src: "{{ local_certs_path }}/wazuh-certificates/{{ item }}"
       dest: "{{ filebeat_ssl_dir }}"
       owner: root
       group: root
diff --git a/roles/wazuh/wazuh-dashboard/tasks/security_actions.yml b/roles/wazuh/wazuh-dashboard/tasks/security_actions.yml
index a71579a9..b2df81cb 100644
--- a/roles/wazuh/wazuh-dashboard/tasks/security_actions.yml
+++ b/roles/wazuh/wazuh-dashboard/tasks/security_actions.yml
@@ -2,7 +2,7 @@
 
   - name: Copy the certificates from local to the Wazuh dashboard instance
     copy:
-      src: "{{ local_certs_path }}/certs/{{ item }}"
+      src: "{{ local_certs_path }}/wazuh-certificates/{{ item }}"
       dest: /etc/wazuh-dashboard/certs/
       mode: 0644
     with_items:
diff --git a/roles/wazuh/wazuh-indexer/tasks/local_actions.yml b/roles/wazuh/wazuh-indexer/tasks/local_actions.yml
index 72e80082..2329d25e 100644
--- a/roles/wazuh/wazuh-indexer/tasks/local_actions.yml
+++ b/roles/wazuh/wazuh-indexer/tasks/local_actions.yml
@@ -19,13 +19,13 @@
 
   - name: Local action | Check that the generation tool exists
     stat:
-      path: "{{ local_certs_path }}/wazuh-cert-tool.sh"
+      path: "{{ local_certs_path }}/wazuh-certs-tool.sh"
     register: tool_package
 
   - name: Local action | Download certificates generation tool
     get_url:
       url: "{{ certs_gen_tool_url }}"
-      dest: "{{ local_certs_path }}/wazuh-cert-tool.sh"
+      dest: "{{ local_certs_path }}/wazuh-certs-tool.sh"
     when: not tool_package.stat.exists
 
   - name: Local action | Prepare the certificates generation template file
@@ -37,12 +37,12 @@
 
   - name: Local action | Generate the node & admin certificates in local
     command: >-
-      bash {{ local_certs_path }}/wazuh-cert-tool.sh
+      bash {{ local_certs_path }}/wazuh-certs-tool.sh -A
     become: yes
 
   - name: Get Certificate files
     find:
-      paths: "{{ local_certs_path }}/certs"
+      paths: "{{ local_certs_path }}/wazuh-certificates"
       patterns: "*"
     register: certificate_files
 
diff --git a/roles/wazuh/wazuh-indexer/tasks/security_actions.yml b/roles/wazuh/wazuh-indexer/tasks/security_actions.yml
index 3055ec0a..5a556af6 100644
--- a/roles/wazuh/wazuh-indexer/tasks/security_actions.yml
+++ b/roles/wazuh/wazuh-indexer/tasks/security_actions.yml
@@ -22,7 +22,7 @@
 
 - name: Copy the node & admin certificates to Wazuh indexer cluster
   copy:
-    src: "{{ local_certs_path }}/certs/{{ item }}"
+    src: "{{ local_certs_path }}/wazuh-certificates/{{ item }}"
     dest: "{{ indexer_conf_path }}/certs/"
     mode: 0644
   become: yes