From ae63208579f7bcff14537ffb2da360c30aceab4b Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 11 Mar 2025 15:07:14 -0300 Subject: [PATCH 1/4] Modify wazuh-keystore use --- .../wazuh-manager/config/etc/cont-init.d/2-manager | 4 ++-- 1 file changed, 2 insertions(+), 2 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 0bd90fd6..218b34f0 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,8 +115,8 @@ function_entrypoint_scripts() { function_configure_vulnerability_detection() { if [ "$INDEXER_PASSWORD" != "" ]; then >&2 echo "Configuring password." - /var/ossec/bin/wazuh-keystore -f indexer -k username -v $INDEXER_USERNAME - /var/ossec/bin/wazuh-keystore -f indexer -k password -v $INDEXER_PASSWORD + echo '$INDEXER_USERNAME' | /var/ossec/bin/wazuh-keystore -f indexer -k username + echo '$INDEXER_PASSWORD' | /var/ossec/bin/wazuh-keystore -f indexer -k password fi } From d9206376d1a7709e6375d35952a8a4137fcf2fa8 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 11 Mar 2025 15:08:41 -0300 Subject: [PATCH 2/4] Add changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65e6c5f1..07762859 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,8 @@ All notable changes to this project will be documented in this file. ### Changed -- None +- Modify wazuh-keystore use ([#1750](https://github.com/wazuh/wazuh-docker/pull/1750)) \- (wazuh-keystore) + ### Fixed From cd89f266d294231667d6d7230ef5c701ac28d919 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 11 Mar 2025 15:31:31 -0300 Subject: [PATCH 3/4] Modify wazuh-keystore use --- .../wazuh-manager/config/etc/cont-init.d/2-manager | 4 ++-- 1 file changed, 2 insertions(+), 2 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 218b34f0..ff3e1fdd 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,8 +115,8 @@ function_entrypoint_scripts() { function_configure_vulnerability_detection() { if [ "$INDEXER_PASSWORD" != "" ]; then >&2 echo "Configuring password." - echo '$INDEXER_USERNAME' | /var/ossec/bin/wazuh-keystore -f indexer -k username - echo '$INDEXER_PASSWORD' | /var/ossec/bin/wazuh-keystore -f indexer -k password + echo "$INDEXER_USERNAME" | /var/ossec/bin/wazuh-keystore -f indexer -k username + echo "$INDEXER_PASSWORD" | /var/ossec/bin/wazuh-keystore -f indexer -k password fi } From f5edb2d54b38f7638cc294a9688f6669921633a1 Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Tue, 14 Oct 2025 11:01:30 -0500 Subject: [PATCH 4/4] Update CHANGELOG --- CHANGELOG.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07762859..0d8708fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed -- None +- Backport 4.13.0 changes: Modify wazuh-keystore use ([#2036](https://github.com/wazuh/wazuh-docker/pull/2036)) \- (wazuh-keystore) ### Fixed @@ -27,8 +27,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Modify wazuh-keystore use ([#1750](https://github.com/wazuh/wazuh-docker/pull/1750)) \- (wazuh-keystore) - +- None ### Fixed