From 928bf657e93820fd1f03086f355432eafce12718 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Thu, 7 Apr 2022 15:20:47 -0300
Subject: [PATCH] fix entrypoint for certs builder

---
 indexer-certs-creator/config/entrypoint.sh | 13 +++++++------
 multi-node/generate-indexer-certs.yml      |  1 -
 single-node/generate-indexer-certs.yml     |  1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/indexer-certs-creator/config/entrypoint.sh b/indexer-certs-creator/config/entrypoint.sh
index 41817f22..3a7a7491 100644
--- a/indexer-certs-creator/config/entrypoint.sh
+++ b/indexer-certs-creator/config/entrypoint.sh
@@ -28,13 +28,19 @@ else
   exit 1
 fi
 
+cp /certificates/certs.yml /config.yml
+
 chmod 700 /$CERT_TOOL
 
 ##############################################################################
 # Creating Cluster certificates
 ##############################################################################
 
-/$CERT_TOOL -A
+## Execute cert tool and parsin cert.yml to set UID permissions
+source /$CERT_TOOL -A
+nodes_server=$( cert_parseYaml /config.yml | grep nodes_server_name | sed 's/nodes_server_name=//' )
+arr=($nodes_server)
+
 echo "Moving created certificates to destination directory"
 cp /wazuh-certificates/* /certificates/
 echo "changing certificate permissions"
@@ -48,11 +54,6 @@ cp /certificates/root-ca.key /certificates/root-ca-manager.key
 chown 999:997 /certificates/root-ca-manager.pem
 chown 999:997 /certificates/root-ca-manager.key
 
-## Parsin cert.yml to set UID permissions
-source /$CERT_TOOL
-nodes_server=$( cert_parseYaml /certificates/certs.yml | grep nodes_server_name | sed 's/nodes_server_name=//' )
-arr=($nodes_server)
-
 for i in ${arr[@]}; 
 do 
   chown 999:997 "/certificates/${i}.pem"
diff --git a/multi-node/generate-indexer-certs.yml b/multi-node/generate-indexer-certs.yml
index c29c50d6..0886acd3 100644
--- a/multi-node/generate-indexer-certs.yml
+++ b/multi-node/generate-indexer-certs.yml
@@ -6,5 +6,4 @@ services:
     image: wazuh/wazuh-certs-generator:0.0.1
     hostname: wazuh-certs-generator
     volumes:
-      - ./config/wazuh_indexer_ssl_certs/certs.yml:/config.yml
       - ./config/wazuh_indexer_ssl_certs/:/certificates/
\ No newline at end of file
diff --git a/single-node/generate-indexer-certs.yml b/single-node/generate-indexer-certs.yml
index c29c50d6..0886acd3 100644
--- a/single-node/generate-indexer-certs.yml
+++ b/single-node/generate-indexer-certs.yml
@@ -6,5 +6,4 @@ services:
     image: wazuh/wazuh-certs-generator:0.0.1
     hostname: wazuh-certs-generator
     volumes:
-      - ./config/wazuh_indexer_ssl_certs/certs.yml:/config.yml
       - ./config/wazuh_indexer_ssl_certs/:/certificates/
\ No newline at end of file