Merge branch '4.10.4' of github.com:wazuh/wazuh-docker into change/6569-nokia-private-key-hardcoded-in-wazuh-manager-image

This commit is contained in:
Carlos Bordon
2025-11-26 15:18:09 -03:00
11 changed files with 44 additions and 26 deletions
@@ -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
}
@@ -97,7 +97,7 @@ PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/exceptions.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/bucket.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/access_logs.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/pubsub/subscriber.py"
PERMANENT_DATA_EXCP[((i++))]="/etc/filebeat/filebeat.yml"
PERMANENT_DATA_EXCP[((i++))]="/etc/filebeat/wazuh-template.json"
export PERMANENT_DATA_EXCP
# Files mounted in a volume that should be deleted