From 0aa7750c49d975c68e0abefa208d22f1a7786f5a Mon Sep 17 00:00:00 2001
From: Carlos Bordon <carlos.e.bordon@gmail.com>
Date: Fri, 5 Dec 2025 10:21:33 -0300
Subject: [PATCH] Added wazuh_app script execution to config.sh file

---
 build-docker-images/wazuh-dashboard/Dockerfile    |  4 +---
 .../wazuh-dashboard/config/entrypoint.sh          |  3 +++
 .../wazuh-dashboard/config/wazuh_app_config.sh    | 15 ---------------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile
index 3656eeea..eca8fb67 100644
--- a/build-docker-images/wazuh-dashboard/Dockerfile
+++ b/build-docker-images/wazuh-dashboard/Dockerfile
@@ -8,7 +8,6 @@ ARG INSTALL_DIR=/usr/share/wazuh-dashboard
 ARG TARGETARCH
 ARG wazuh_dashboard_url_amd64_rpm
 ARG wazuh_dashboard_url_arm64_rpm
-ARG wazuh_certs_tool
 ARG wazuh_config_yml
 
 # Update and install dependencies
@@ -76,8 +75,7 @@ RUN yum install shadow-utils -y && \
     mkdir -p $INSTALL_DIR && \
     chown 1000:1000 $INSTALL_DIR && \
     chown 1000:1000 /*.sh && \
-    mkdir -p /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom && \
-    bash /wazuh_app_config.sh
+    mkdir -p /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
 
 # Copy Install dir from builder to current image
 COPY --from=builder --chown=1000:1000 $INSTALL_DIR $INSTALL_DIR
diff --git a/build-docker-images/wazuh-dashboard/config/entrypoint.sh b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
index fbefb543..7ac9e997 100644
--- a/build-docker-images/wazuh-dashboard/config/entrypoint.sh
+++ b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
@@ -17,6 +17,7 @@ export OPENSEARCH_DASHBOARDS_HOME=/usr/share/wazuh-dashboard
 export PATH=$OPENSEARCH_DASHBOARDS_HOME/bin:$PATH
 DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}"
 DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}"
+export OPENSEARCH_DASHBOARDS_CONFIG=/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
 
 # Create and configure Wazuh dashboard keystore
 
@@ -24,6 +25,8 @@ yes | $OPENSEARCH_DASHBOARDS_HOME/bin/opensearch-dashboards-keystore create --al
 echo $DASHBOARD_USERNAME | $OPENSEARCH_DASHBOARDS_HOME/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \
 echo $DASHBOARD_PASSWORD | $OPENSEARCH_DASHBOARDS_HOME/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root
 
+/wazuh_app_config.sh
+
 opensearch_dashboards_vars=(
     opensearch.hosts
     server.port
diff --git a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
index 5a318aea..b8b69e74 100644
--- a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
+++ b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
@@ -15,21 +15,6 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
 
 dashboard_config_file="${CONFIG_DIR}/opensearch_dashboards.yml"
 
-printf "Modifying Wazuh App configuration file: %s\n" "$dashboard_config_file"
-ls -la ${CONFIG_DIR}
-
-printf "/etc/wazuh-dashboard contents:\n"
-ls -la /etc/wazuh-dashboard
-
-# Modify opensearch_dashboards.yml config paths
-if [ -d "/etc/wazuh-dashboard" ]; then
-    mkdir -p ${CONFIG_DIR}
-    mkdir -p ${CONFIG_DIR}/certs
-    mv /etc/wazuh-dashboard/* ${CONFIG_DIR}/
-    rmdir /etc/wazuh-dashboard
-fi
-sed -i "s|/etc/wazuh-dashboard|${CONFIG_DIR}|g" ${dashboard_config_file}
-
 declare -A CONFIG_MAP=(
   [pattern]=$PATTERN
   [checks.pattern]=$CHECKS_PATTERN