From b455dc3938da1f2e2edc2393fb9d81b81b7c2315 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 20 Feb 2026 21:56:56 +0700 Subject: [PATCH 1/5] Change Wazuh manager certificates names --- multi-node/docker-compose.yml | 8 ++++---- single-node/docker-compose.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 1b2d972f..8eafe5ce 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -34,8 +34,8 @@ services: - master-wazuh-var-multigroups:/var/wazuh-manager/var/multigroups - master-wazuh-active-response:/var/wazuh-manager/active-response/bin - ./wazuh-certificates/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem - - ./wazuh-certificates/wazuh.master.pem:/var/wazuh-manager/etc/certs/server.pem - - ./wazuh-certificates/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/server-key.pem + - ./wazuh-certificates/wazuh.master.pem:/var/wazuh-manager/etc/certs/manager.pem + - ./wazuh-certificates/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem wazuh.worker: image: wazuh/wazuh-manager:5.0.0 hostname: wazuh.worker @@ -66,8 +66,8 @@ services: - worker-wazuh-var-multigroups:/var/wazuh-manager/var/multigroups - worker-wazuh-active-response:/var/wazuh-manager/active-response/bin - ./wazuh-certificates/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem - - ./wazuh-certificates/wazuh.worker.pem:/var/wazuh-manager/etc/certs/server.pem - - ./wazuh-certificates/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/server-key.pem + - ./wazuh-certificates/wazuh.worker.pem:/var/wazuh-manager/etc/certs/manager.pem + - ./wazuh-certificates/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem wazuh1.indexer: image: wazuh/wazuh-indexer:5.0.0 diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index ae7334ca..58a74613 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -34,8 +34,8 @@ services: - wazuh_var_multigroups:/var/wazuh-manager/var/multigroups - wazuh_active_response:/var/wazuh-manager/active-response/bin - ./wazuh-certificates/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem - - ./wazuh-certificates/wazuh.manager.pem:/var/wazuh-manager/etc/certs/server.pem - - ./wazuh-certificates/wazuh.manager-key.pem:/var/wazuh-manager/etc/certs/server-key.pem + - ./wazuh-certificates/wazuh.manager.pem:/var/wazuh-manager/etc/certs/manager.pem + - ./wazuh-certificates/wazuh.manager-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem wazuh.indexer: image: wazuh/wazuh-indexer:5.0.0 From 930f30d84f4439f3f701661d16822600fb727812 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 20 Feb 2026 21:59:12 +0700 Subject: [PATCH 2/5] Add Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b93f5a0f..f079a933 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed +- Change Wazuh manager certificates names ([#2223](https://github.com/wazuh/wazuh-docker/pull/2223)) - Move index documents test ([#2221](https://github.com/wazuh/wazuh-docker/pull/2221)) - Separate Agent/Manager - Docker - Adapt image build process ([#2220](https://github.com/wazuh/wazuh-docker/pull/2220)) - Remove revision input ([#2217](https://github.com/wazuh/wazuh-docker/pull/2217)) From c11ecfe883edd6d317e4f5fe36a66511669839b4 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Wed, 25 Feb 2026 21:16:42 +0700 Subject: [PATCH 3/5] Change binary names --- .github/.goss.yaml | 6 +++--- .../wazuh-manager/config/etc/cont-init.d/1-manager | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 4354ab1d..fc1880fd 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -1,5 +1,5 @@ file: - /var/wazuh-manager/bin/wazuh-control: + /var/wazuh-manager/bin/wazuh-manager-control: exists: true mode: "0750" owner: root @@ -15,14 +15,14 @@ file: contains: [] /var/wazuh-manager/etc/sslmanager.cert: exists: true - mode: "0644" + mode: "0640" owner: root group: root filetype: file contains: [] /var/wazuh-manager/etc/sslmanager.key: exists: true - mode: "0600" + mode: "0640" owner: root group: root filetype: file diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-manager b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-manager index d8944a82..448832b9 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-manager +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-manager @@ -108,8 +108,8 @@ function_entrypoint_scripts() { function_configure_vulnerability_detection() { if [ "$INDEXER_PASSWORD" != "" ]; then >&2 echo "Configuring password." - echo "$INDEXER_USERNAME" | /var/wazuh-manager/bin/wazuh-keystore -f indexer -k username - echo "$INDEXER_PASSWORD" | /var/wazuh-manager/bin/wazuh-keystore -f indexer -k password + echo "$INDEXER_USERNAME" | /var/wazuh-manager/bin/wazuh-manager-keystore -f indexer -k username + echo "$INDEXER_PASSWORD" | /var/wazuh-manager/bin/wazuh-manager-keystore -f indexer -k password fi } @@ -126,4 +126,4 @@ function_configure_vulnerability_detection function_entrypoint_scripts # Start Wazuh -/var/wazuh-manager/bin/wazuh-control start +/var/wazuh-manager/bin/wazuh-manager-control start From 552d0c8d59737e89bc4f4a90471ca01607c60e62 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Wed, 25 Feb 2026 21:50:46 +0700 Subject: [PATCH 4/5] Change cert permissions --- .github/.goss.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/.goss.yaml b/.github/.goss.yaml index fc1880fd..6ccdf185 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -15,14 +15,14 @@ file: contains: [] /var/wazuh-manager/etc/sslmanager.cert: exists: true - mode: "0640" + mode: "0644" owner: root group: root filetype: file contains: [] /var/wazuh-manager/etc/sslmanager.key: exists: true - mode: "0640" + mode: "0600" owner: root group: root filetype: file From bfa3d9db58cfed337897df752ad995ff03d0e929 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Thu, 26 Feb 2026 01:03:01 +0700 Subject: [PATCH 5/5] Change Wazuh agent check --- .github/workflows/5_pr_check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index ae2e4617..bfae45b7 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -292,7 +292,7 @@ jobs: for i in {1..5}; do TOKEN=$(curl -s -u ${{ env.API_USERNAME }}:${{ env.API_PASSWORD }} -k -X GET "https://127.0.0.1:55000/security/user/authenticate?raw=true") agents="`curl -k -s -X GET "https://127.0.0.1:55000/agents?pretty=true" -H "Authorization: Bearer ${TOKEN}" | jq -r .data.affected_items | grep active | wc -l`" - if [[ $agents -gt 1 ]]; then + if [[ $agents -gt 0 ]]; then echo "Wazuh agents: ${agents}" echo "OK" enrolled=true @@ -580,7 +580,7 @@ jobs: for i in {1..5}; do TOKEN=$(curl -s -u ${{ env.API_USERNAME }}:${{ env.API_PASSWORD }} -k -X GET "https://127.0.0.1:55000/security/user/authenticate?raw=true") agents="`curl -k -s -X GET "https://127.0.0.1:55000/agents?pretty=true" -H "Authorization: Bearer ${TOKEN}" | jq -r .data.affected_items | grep active | wc -l`" - if [[ $agents -gt 1 ]]; then + if [[ $agents -gt 0 ]]; then echo "Wazuh agents: ${agents}" echo "OK" enrolled=true