From d69f5c0c5dec34da72b07665a9206c268bc0f53c Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Tue, 25 Nov 2025 01:22:11 +0700 Subject: [PATCH 1/3] Add new path for Wazun indexer and new function for permanent_data exception --- build-docker-images/wazuh-indexer/config/config.sh | 8 ++++---- .../wazuh-manager/config/etc/cont-init.d/0-wazuh-init | 11 ++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index 1761b016..033c52dd 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -73,10 +73,10 @@ mkdir -p ${TARGET_DIR}/usr/lib/sysctl.d mkdir -p ${TARGET_DIR}/usr/lib/systemd/system mkdir -p ${TARGET_DIR}${CONFIG_DIR}/certs # Copy Wazuh's config files for the security plugin -cp -pr /roles_mapping.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/ -cp -pr /roles.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/ -cp -pr /action_groups.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/ -cp -pr /internal_users.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/ +cp -pr /roles_mapping.yml ${TARGET_DIR}${CONFIG_DIR}/opensearch-security/ +cp -pr /roles.yml ${TARGET_DIR}${CONFIG_DIR}/opensearch-security/ +cp -pr /action_groups.yml ${TARGET_DIR}${CONFIG_DIR}/opensearch-security/ +cp -pr /internal_users.yml ${TARGET_DIR}${CONFIG_DIR}/opensearch-security/ cp -pr /opensearch.yml ${TARGET_DIR}${CONFIG_DIR} # Copy Wazuh indexer's certificates cp -pr /wazuh-certificates/demo.indexer.pem ${TARGET_DIR}${CONFIG_DIR}/certs/indexer.pem diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init index ca125b1b..ec2903b5 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init @@ -70,8 +70,17 @@ apply_exclusion_data() { mkdir -p ${DIR} fi + safe_cp() { + if cp -p "$1" "$2" 2>/dev/null; then + return 0 + else + echo "Warning: Could not copy $1 (may be read-only)" + return 0 + fi + } + print "Updating ${exclusion_file}" - exec_cmd "cp -p ${WAZUH_INSTALL_PATH}/data_tmp/exclusion/${exclusion_file} ${exclusion_file}" + exec_cmd "safe_cp ${WAZUH_INSTALL_PATH}/data_tmp/exclusion/${exclusion_file} ${exclusion_file}" fi done } From 2d6c92036643c35585e9c145b5053d325bff4ad4 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Tue, 25 Nov 2025 20:57:45 +0700 Subject: [PATCH 2/3] Delete opensearch-security directory creation --- build-docker-images/wazuh-indexer/config/config.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index 033c52dd..c8e6f529 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -62,7 +62,6 @@ chmod 755 $CERT_TOOL && bash /$CERT_TOOL -A # copy to target mkdir -p ${TARGET_DIR}${INSTALLATION_DIR} -mkdir -p ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/ mkdir -p ${TARGET_DIR}${CONFIG_DIR} mkdir -p ${TARGET_DIR}${LIB_DIR} mkdir -p ${TARGET_DIR}${LOG_DIR} From fb6be60afbd636527c79e13fbdc866b51ec6b438 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Tue, 25 Nov 2025 21:52:07 +0700 Subject: [PATCH 3/3] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97c89afc..b8e66bd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. ### Added +- Code improvements for 4.14.2 ([#2090](https://github.com/wazuh/wazuh-docker/pull/2090)) - Artifactory vulnerabilities notification ([#2078](https://github.com/wazuh/wazuh-docker/pull/2078)) ### Changed