From daf6eb643585b72738b7fd1e2e45c82a6d786bcb Mon Sep 17 00:00:00 2001 From: Carlos Bordon Date: Thu, 4 Dec 2025 16:11:36 -0300 Subject: [PATCH] Removed config.sh file from wazuh dashboard --- build-docker-images/wazuh-dashboard/Dockerfile | 4 ---- .../wazuh-dashboard/config/config.sh | 16 ---------------- .../wazuh-dashboard/config/wazuh_app_config.sh | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 build-docker-images/wazuh-dashboard/config/config.sh diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index 22dcdc78..3656eeea 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -27,10 +27,6 @@ RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chmod -R 775 $INSTALL_DIR/data/wazu RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/bin/node RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/fallback/bin/node -# Generate certificates -COPY config/config.sh . -RUN bash config.sh - ################################################################################ # Build stage 1 (the current Wazuh dashboard image): # diff --git a/build-docker-images/wazuh-dashboard/config/config.sh b/build-docker-images/wazuh-dashboard/config/config.sh deleted file mode 100644 index b106a77e..00000000 --- a/build-docker-images/wazuh-dashboard/config/config.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) -# This has to be exported to make some magic below work. -export DH_OPTIONS - -export NAME=wazuh-dashboard -export INSTALLATION_DIR=/usr/share/${NAME} -export CONFIG_DIR=${INSTALLATION_DIR}/config - -# 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" ${CONFIG_DIR}/opensearch_dashboards.yml 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 db84b598..5f43a0e3 100644 --- a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh +++ b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh @@ -6,9 +6,23 @@ wazuh_port="${API_PORT:-55000}" api_username="${API_USERNAME:-wazuh-wui}" api_password="${API_PASSWORD:-wazuh-wui}" api_run_as="${RUN_AS:-false}" +export DH_OPTIONS + +export NAME=wazuh-dashboard +export INSTALLATION_DIR=/usr/share/${NAME} +export CONFIG_DIR=${INSTALLATION_DIR}/config dashboard_config_file="/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml" +# 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" ${CONFIG_DIR}/opensearch_dashboards.yml + declare -A CONFIG_MAP=( [pattern]=$PATTERN [checks.pattern]=$CHECKS_PATTERN