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

Merge `4.8.0` into `4.8.1`

build-docker-images/wazuh-manager/Dockerfile

@@ -10,7 +10,7 @@ ARG FILEBEAT_CHANNEL=filebeat-oss
 ARG FILEBEAT_VERSION=7.10.2
 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 /
 RUN chmod 775 /check_repository.sh

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 username -v $INDEXER_USERNAME
+  /var/ossec/bin/wazuh-keystore -f indexer -k password -v $INDEXER_PASSWORD
 fi
 }
 

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>

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>

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>