diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index ded56d43..b31e3cf1 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -2,13 +2,7 @@ WAZUH_IMAGE_VERSION=4.7.0 WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g') WAZUH_TAG_REVISION=1 WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g') - -## If wazuh manager exists in apt dev repository, change variables, if not, exit 1 -if [ "$WAZUH_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then - IMAGE_VERSION=${WAZUH_IMAGE_VERSION} -else - IMAGE_VERSION=${WAZUH_IMAGE_VERSION} -fi +IMAGE_VERSION=${WAZUH_IMAGE_VERSION} echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env diff --git a/indexer-certs-creator/config/entrypoint.sh b/indexer-certs-creator/config/entrypoint.sh index 03d866e7..468f1336 100644 --- a/indexer-certs-creator/config/entrypoint.sh +++ b/indexer-certs-creator/config/entrypoint.sh @@ -17,13 +17,13 @@ CERT_TOOL_PACKAGES_DEV=$(curl --silent -I $PACKAGES_DEV_URL$CERT_TOOL | grep -E ## If cert tool exists in some bucket, download it, if not exit 1 if [ "$CERT_TOOL_PACKAGES" = "200" ]; then - curl -o $CERT_TOOL $PACKAGES_URL$CERT_TOOL - echo "Cert tool exists in Packages bucket" + curl -o $CERT_TOOL $PACKAGES_URL$CERT_TOOL -s + echo "The tool to create the certificates exists in the in Packages bucket" elif [ "$CERT_TOOL_PACKAGES_DEV" = "200" ]; then - curl -o $CERT_TOOL $PACKAGES_DEV_URL$CERT_TOOL - echo "Cert tool exists in Packages-dev bucket" + curl -o $CERT_TOOL $PACKAGES_DEV_URL$CERT_TOOL -s + echo "The tool to create the certificates exists in Packages-dev bucket" else - echo "Cert tool does not exist in any bucket" + echo "The tool to create the certificates does not exist in any bucket" echo "ERROR: certificates were not created" exit 1 fi @@ -41,9 +41,9 @@ source /$CERT_TOOL -A nodes_server=$( cert_parseYaml /config.yml | grep nodes_server__name | sed 's/nodes_server__name=//' ) node_names=($nodes_server) -echo "Moving created certificates to destination directory" +echo "Moving created certificates to the destination directory" cp /wazuh-certificates/* /certificates/ -echo "changing certificate permissions" +echo "Changing certificate permissions" chmod -R 500 /certificates chmod -R 400 /certificates/* echo "Setting UID indexer and dashboard" diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index aec223a1..300f2e2f 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -150,10 +150,17 @@ 1h + + + no + 8 + 9 + 1h + + yes - 2010 1h @@ -354,4 +361,4 @@ /var/log/dpkg.log - \ No newline at end of file + diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 46fceb1e..dc18b6e4 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -144,6 +144,14 @@ 1h + + + no + 8 + 9 + 1h + + yes @@ -153,7 +161,6 @@ yes - 2010 1h @@ -354,4 +361,4 @@ /var/log/dpkg.log - \ No newline at end of file + diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 1ecbe45f..a93e099f 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -6,6 +6,13 @@ services: image: wazuh/wazuh-manager:4.7.0 hostname: wazuh.master restart: always + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 655360 + hard: 655360 ports: - "1515:1515" - "514:514/udp" @@ -41,6 +48,13 @@ services: image: wazuh/wazuh-manager:4.7.0 hostname: wazuh.worker restart: always + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 655360 + hard: 655360 environment: - INDEXER_URL=https://wazuh1.indexer:9200 - INDEXER_USERNAME=admin diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 4db508d6..916b42a8 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -144,6 +144,14 @@ 1h + + + no + 8 + 9 + 1h + + yes @@ -153,7 +161,6 @@ yes - 2010 1h diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 79919e53..a5eca13f 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -6,6 +6,13 @@ services: image: wazuh/wazuh-manager:4.7.0 hostname: wazuh.manager restart: always + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 655360 + hard: 655360 ports: - "1514:1514" - "1515:1515"