yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity

Merge pull request #2223 from wazuh/enhancement/2207-adapt-docker-deployment

Browse Source 
Change Wazuh manager certificates names
This commit is contained in:
Carlos Bordon
2026-02-26 11:47:10 -03:00
committed by GitHub
parent 06a2a28c8d bfa3d9db58
commit 997e681dbe
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/.goss.yaml
+1 -1
View File
@@ -1,5 +1,5 @@
file: file:
/var/wazuh-manager/bin/wazuh-control: /var/wazuh-manager/bin/wazuh-manager-control:
exists: true exists: true
mode: "0750" mode: "0750"
owner: root owner: root
.github/workflows/5_pr_check.yml
+2 -2
View File
@@ -292,7 +292,7 @@ jobs:
for i in {1..5}; do 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") 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`" 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 "Wazuh agents: ${agents}"
echo "OK" echo "OK"
enrolled=true enrolled=true
@@ -580,7 +580,7 @@ jobs:
for i in {1..5}; do 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") 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`" 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 "Wazuh agents: ${agents}"
echo "OK" echo "OK"
enrolled=true enrolled=true
CHANGELOG.md
+1
View File
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
### Changed ### 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)) - 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)) - 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)) - Remove revision input ([#2217](https://github.com/wazuh/wazuh-docker/pull/2217))
build-docker-images/wazuh-manager/config/etc/cont-init.d/1-manager
+3 -3
View File
@@ -108,8 +108,8 @@ function_entrypoint_scripts() {
function_configure_vulnerability_detection() { function_configure_vulnerability_detection() {
if [ "$INDEXER_PASSWORD" != "" ]; then if [ "$INDEXER_PASSWORD" != "" ]; then
>&2 echo "Configuring password." >&2 echo "Configuring password."
echo "$INDEXER_USERNAME" | /var/wazuh-manager/bin/wazuh-keystore -f indexer -k username echo "$INDEXER_USERNAME" | /var/wazuh-manager/bin/wazuh-manager-keystore -f indexer -k username
echo "$INDEXER_PASSWORD" | /var/wazuh-manager/bin/wazuh-keystore -f indexer -k password echo "$INDEXER_PASSWORD" | /var/wazuh-manager/bin/wazuh-manager-keystore -f indexer -k password
fi fi
} }
@@ -126,4 +126,4 @@ function_configure_vulnerability_detection
function_entrypoint_scripts function_entrypoint_scripts
# Start Wazuh # Start Wazuh
/var/wazuh-manager/bin/wazuh-control start /var/wazuh-manager/bin/wazuh-manager-control start
multi-node/docker-compose.yml
+4 -4
View File
@@ -34,8 +34,8 @@ services:
- master-wazuh-var-multigroups:/var/wazuh-manager/var/multigroups - master-wazuh-var-multigroups:/var/wazuh-manager/var/multigroups
- master-wazuh-active-response:/var/wazuh-manager/active-response/bin - 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/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.pem:/var/wazuh-manager/etc/certs/manager.pem
- ./wazuh-certificates/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/server-key.pem - ./wazuh-certificates/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
wazuh.worker: wazuh.worker:
image: wazuh/wazuh-manager:5.0.0 image: wazuh/wazuh-manager:5.0.0
hostname: wazuh.worker hostname: wazuh.worker
@@ -66,8 +66,8 @@ services:
- worker-wazuh-var-multigroups:/var/wazuh-manager/var/multigroups - worker-wazuh-var-multigroups:/var/wazuh-manager/var/multigroups
- worker-wazuh-active-response:/var/wazuh-manager/active-response/bin - 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/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.pem:/var/wazuh-manager/etc/certs/manager.pem
- ./wazuh-certificates/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/server-key.pem - ./wazuh-certificates/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
wazuh1.indexer: wazuh1.indexer:
image: wazuh/wazuh-indexer:5.0.0 image: wazuh/wazuh-indexer:5.0.0
single-node/docker-compose.yml
+2 -2
View File
@@ -34,8 +34,8 @@ services:
- wazuh_var_multigroups:/var/wazuh-manager/var/multigroups - wazuh_var_multigroups:/var/wazuh-manager/var/multigroups
- wazuh_active_response:/var/wazuh-manager/active-response/bin - wazuh_active_response:/var/wazuh-manager/active-response/bin
- ./wazuh-certificates/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem - ./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.pem:/var/wazuh-manager/etc/certs/manager.pem
- ./wazuh-certificates/wazuh.manager-key.pem:/var/wazuh-manager/etc/certs/server-key.pem - ./wazuh-certificates/wazuh.manager-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
wazuh.indexer: wazuh.indexer:
image: wazuh/wazuh-indexer:5.0.0 image: wazuh/wazuh-indexer:5.0.0