paulmataruso/wazuh-docker-orginal
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-docker.git synced 2025-11-06 15:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1202 from wazuh/merge-4.8.0-into-4.8.1

Browse Source 
Merge `4.8.0` into `4.8.1`
This commit is contained in:
Gonzalo Acuña
2024-02-07 13:42:45 -03:00
committed by GitHub
parent a89eddb135 f746e96b74
commit a6d0a1ffeb
5 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-docker-images/wazuh-manager/Dockerfile
View File

@@ -10,7 +10,7 @@ ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2 ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE ARG WAZUH_FILEBEAT_MODULE
RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y RUN apt-get update && apt install curl apt-transport-https lsb-release xz-utils gnupg -y
COPY config/check_repository.sh / COPY config/check_repository.sh /
RUN chmod 775 /check_repository.sh RUN chmod 775 /check_repository.sh

3
build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager
View File

@@ -115,7 +115,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."
sed -i "s|<password>VDPass</password>|<password>$INDEXER_PASSWORD</password>|g" /var/ossec/etc/ossec.conf /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 fi
} }

2
multi-node/config/wazuh_cluster/wazuh_manager.conf
View File

@@ -108,8 +108,6 @@
<host>https://wazuh2.indexer:9200</host> <host>https://wazuh2.indexer:9200</host>
<host>https://wazuh3.indexer:9200</host> <host>https://wazuh3.indexer:9200</host>
</hosts> </hosts>
<username>admin</username>
<password>VDPass</password>
<ssl> <ssl>
<certificate_authorities> <certificate_authorities>
<ca>/etc/ssl/root-ca.pem</ca> <ca>/etc/ssl/root-ca.pem</ca>

2
multi-node/config/wazuh_cluster/wazuh_worker.conf
View File

@@ -108,8 +108,6 @@
<host>https://wazuh2.indexer:9200</host> <host>https://wazuh2.indexer:9200</host>
<host>https://wazuh3.indexer:9200</host> <host>https://wazuh3.indexer:9200</host>
</hosts> </hosts>
<username>admin</username>
<password>VDPass</password>
<ssl> <ssl>
<certificate_authorities> <certificate_authorities>
<ca>/etc/ssl/root-ca.pem</ca> <ca>/etc/ssl/root-ca.pem</ca>

2
single-node/config/wazuh_cluster/wazuh_manager.conf
View File

@@ -106,8 +106,6 @@
<hosts> <hosts>
<host>https://wazuh.indexer:9200</host> <host>https://wazuh.indexer:9200</host>
</hosts> </hosts>
<username>admin</username>
<password>VDPass</password>
<ssl> <ssl>
<certificate_authorities> <certificate_authorities>
<ca>/etc/ssl/root-ca.pem</ca> <ca>/etc/ssl/root-ca.pem</ca>