Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 4.8.2 into master #1204

Merged
merged 16 commits into from
Feb 7, 2024
Merged

Merge 4.8.2 into master #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
99e708c
Updated indexer-ism-init.sh execution and removed wazuh-template push…
c-bordon Jan 4, 2024
892822f
Update check test
c-bordon Jan 4, 2024
caddf28
Testing with sleep
c-bordon Jan 4, 2024
d98ef7a
Merge pull request #1171 from wazuh/change/1503-update-ISM-script-exe…
teddytpc1 Jan 5, 2024
b2ef887
Bump revision for 4.8.0-alpha2
teddytpc1 Jan 9, 2024
d820c63
Merge pull request #1181 from wazuh/1180-bump-revision
teddytpc1 Jan 9, 2024
adba797
add xz-utils install
vcerenu Jan 16, 2024
eb894d8
Merge pull request #1188 from wazuh/666-pre-install-xz-utils-in-proje…
teddytpc1 Jan 17, 2024
114d6ed
Indexer tag and wazuh-keystore updates
teddytpc1 Jan 29, 2024
ec63264
Changed user for username in the wazuh-keystore command
teddytpc1 Jan 31, 2024
52a9479
Merge pull request #1196 from wazuh/1195-adapt-vd-to-wazuh-keystore-f…
teddytpc1 Feb 2, 2024
174ae3d
bump revision
vcerenu Feb 5, 2024
db7596c
Merge pull request #1200 from wazuh/1199-support-new-stage-beta-1-for…
davidcr01 Feb 5, 2024
f746e96
Merge branch '4.8.1' into merge-4.8.0-into-4.8.1
teddytpc1 Feb 7, 2024
a6d0a1f
Merge pull request #1202 from wazuh/merge-4.8.0-into-4.8.1
teddytpc1 Feb 7, 2024
c99985f
Merge pull request #1203 from wazuh/merge-4.8.1-into-4.8.2
teddytpc1 Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-manager/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE

RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y
RUN apt-get update && apt install curl apt-transport-https lsb-release xz-utils gnupg -y

COPY config/check_repository.sh /
RUN chmod 775 /check_repository.sh
Expand Down
3 changes: 2 additions & 1 deletion build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ function_entrypoint_scripts() {
function_configure_vulnerability_detection() {
if [ "$INDEXER_PASSWORD" != "" ]; then
>&2 echo "Configuring password."
sed -i "s|<password>VDPass</password>|<password>$INDEXER_PASSWORD</password>|g" /var/ossec/etc/ossec.conf
/var/ossec/bin/wazuh-keystore -f indexer -k username -v $INDEXER_USERNAME
/var/ossec/bin/wazuh-keystore -f indexer -k password -v $INDEXER_PASSWORD
fi
}

Expand Down
2 changes: 0 additions & 2 deletions multi-node/config/wazuh_cluster/wazuh_manager.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@
<host>https://wazuh2.indexer:9200</host>
<host>https://wazuh3.indexer:9200</host>
</hosts>
<username>admin</username>
<password>VDPass</password>
<ssl>
<certificate_authorities>
<ca>/etc/ssl/root-ca.pem</ca>
Expand Down
2 changes: 0 additions & 2 deletions multi-node/config/wazuh_cluster/wazuh_worker.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@
<host>https://wazuh2.indexer:9200</host>
<host>https://wazuh3.indexer:9200</host>
</hosts>
<username>admin</username>
<password>VDPass</password>
<ssl>
<certificate_authorities>
<ca>/etc/ssl/root-ca.pem</ca>
Expand Down
2 changes: 0 additions & 2 deletions single-node/config/wazuh_cluster/wazuh_manager.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@
<hosts>
<host>https://wazuh.indexer:9200</host>
</hosts>
<username>admin</username>
<password>VDPass</password>
<ssl>
<certificate_authorities>
<ca>/etc/ssl/root-ca.pem</ca>
Expand Down
Loading