From 114d6edff21c3ba2df275167c24c3f2be36bd96d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Mon, 29 Jan 2024 15:48:48 -0300
Subject: [PATCH 1/2] Indexer tag and wazuh-keystore updates

---
 .../wazuh-manager/config/etc/cont-init.d/2-manager             | 3 ++-
 multi-node/config/wazuh_cluster/wazuh_manager.conf             | 2 --
 multi-node/config/wazuh_cluster/wazuh_worker.conf              | 2 --
 single-node/config/wazuh_cluster/wazuh_manager.conf            | 2 --
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager
index f0cf6ec3..dd14d74f 100644
--- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager
+++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager
@@ -115,7 +115,8 @@ function_entrypoint_scripts() {
 function_configure_vulnerability_detection() {
 if [ "$INDEXER_PASSWORD" != "" ]; then
   >&2 echo "Configuring password."
-  sed -i "s|<password>VDPass</password>|<password>$INDEXER_PASSWORD</password>|g" /var/ossec/etc/ossec.conf
+  /var/ossec/bin/wazuh-keystore -f indexer -k user -v $INDEXER_USERNAME
+  /var/ossec/bin/wazuh-keystore -f indexer -k password -v $INDEXER_PASSWORD
 fi
 }
 
diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf
index 1ec10630..92e5662f 100644
--- a/multi-node/config/wazuh_cluster/wazuh_manager.conf
+++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf
@@ -108,8 +108,6 @@
       <host>https://wazuh2.indexer:9200</host>
       <host>https://wazuh3.indexer:9200</host>
     </hosts>
-    <username>admin</username>
-    <password>VDPass</password>
     <ssl>
       <certificate_authorities>
         <ca>/etc/ssl/root-ca.pem</ca>
diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf
index 9d277622..b49aa071 100644
--- a/multi-node/config/wazuh_cluster/wazuh_worker.conf
+++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf
@@ -108,8 +108,6 @@
       <host>https://wazuh2.indexer:9200</host>
       <host>https://wazuh3.indexer:9200</host>
     </hosts>
-    <username>admin</username>
-    <password>VDPass</password>
     <ssl>
       <certificate_authorities>
         <ca>/etc/ssl/root-ca.pem</ca>
diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf
index 9dd0990c..64da4d81 100644
--- a/single-node/config/wazuh_cluster/wazuh_manager.conf
+++ b/single-node/config/wazuh_cluster/wazuh_manager.conf
@@ -106,8 +106,6 @@
     <hosts>
       <host>https://wazuh.indexer:9200</host>
     </hosts>
-    <username>admin</username>
-    <password>VDPass</password>
     <ssl>
       <certificate_authorities>
         <ca>/etc/ssl/root-ca.pem</ca>

From ec63264545aa70bfd14f4df04eb151cbba82f43e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Wed, 31 Jan 2024 09:23:50 -0300
Subject: [PATCH 2/2] Changed user for username in the wazuh-keystore command

---
 .../wazuh-manager/config/etc/cont-init.d/2-manager              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager
index dd14d74f..0bd90fd6 100644
--- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager
+++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager
@@ -115,7 +115,7 @@ function_entrypoint_scripts() {
 function_configure_vulnerability_detection() {
 if [ "$INDEXER_PASSWORD" != "" ]; then
   >&2 echo "Configuring password."
-  /var/ossec/bin/wazuh-keystore -f indexer -k user -v $INDEXER_USERNAME
+  /var/ossec/bin/wazuh-keystore -f indexer -k username -v $INDEXER_USERNAME
   /var/ossec/bin/wazuh-keystore -f indexer -k password -v $INDEXER_PASSWORD
 fi
 }