From 19ed9666b94c95e85b0e1675206f1013fb43d95c Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 25 Mar 2021 15:47:01 +0100 Subject: [PATCH] Adap to wazuh 4.1.2 (#454) --- wazuh/Dockerfile | 2 +- wazuh/config/01-wazuh.sh | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 3e7e8f56..4408d493 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -3,7 +3,7 @@ FROM waystonesystems/baseimage-centos:0.2.0 # Arguments ARG FILEBEAT_VERSION=7.10.0 -ARG WAZUH_VERSION=4.0.4-1 +ARG WAZUH_VERSION=4.1.2-1 # Environment variables ENV API_USER="foo" \ diff --git a/wazuh/config/01-wazuh.sh b/wazuh/config/01-wazuh.sh index c4c6c615..639c7ec6 100644 --- a/wazuh/config/01-wazuh.sh +++ b/wazuh/config/01-wazuh.sh @@ -56,16 +56,12 @@ check_update() { return 0 else echo "Different Wazuh version: Update" - mayor_previous_version=$(cat /var/ossec/etc/VERSION | grep -i version | cut -d'"' -f2 | cut -d'.' -f1) - if [[ ${mayor_previous_version} == "v3" ]]; then - echo "Remove Wazuh API deprecated files" - rm -rf "${WAZUH_INSTALL_PATH}/api/configuration/auth" - rm "${WAZUH_INSTALL_PATH}/api/configuration/config.js" - rm "${WAZUH_INSTALL_PATH}/api/configuration/preloaded_vars.conf" - echo "Load new API configuration" - exec_cmd "cp -a ${WAZUH_INSTALL_PATH}/data_tmp/permanent/var/ossec/api/configuration/. /var/ossec/api/configuration" - echo "Remove Wazuh agent-info queue" - rm -rf "${WAZUH_INSTALL_PATH}/queue/agent-info" + if [[ ${previous_version} == "v4.0.4" ]]; then + print "Installing /var/ossec/queue/tasks directory and subdirectories" + mkdir /var/ossec/queue/tasks + chown ossec:ossec /var/ossec/queue/tasks + chmod 770 /var/ossec/queue/tasks + exec_cmd "cp -a ${WAZUH_INSTALL_PATH}/data_tmp/permanent/var/ossec/queue/tasks/. /var/ossec/queue/tasks" fi return 1 fi