Skip to content

Commit

Permalink
Merge branch '4.6.0' of https://github.com/wazuh/wazuh-packages into …
Browse files Browse the repository at this point in the history
…4.7.0
  • Loading branch information
DFolchA committed Sep 7, 2023
2 parents deaee6b + dbb93f5 commit 1733100
Show file tree
Hide file tree
Showing 33 changed files with 1,189 additions and 2,107 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,20 @@ All notable changes to this project will be documented in this file.

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.6.0

## [4.5.3]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.3

## [4.5.2]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2

## [v4.5.1]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2

## [v4.5.1]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.1

## [v4.5.0]
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,17 @@ The following table shows the references for the versions of each component.
|-----------------|-----------------------|
| 4.3.x | 1.2.0 |
| 4.4.0 | 2.4.1 |
| 4.4.1 - 4.7.0 | 2.6.0 |
| 4.4.1 - 4.5.2 | 2.6.0 |
| 4.6.0 - | 2.8.0 |

### Wazuh indexer

| Wazuh indexer | Opensearch |
|-----------------|-----------------------|
| 4.3.x | 1.2.4 |
| 4.4.0 | 2.4.1 |
| 4.4.1 - 4.7.0 | 2.6.0 |
| 4.4.1 - 4.5.2 | 2.6.0 |
| 4.6.0 - | 2.8.0 |

## Contribute

Expand Down
2 changes: 2 additions & 0 deletions aix/SPECS/wazuh-agent-aix.spec
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ rm -fr %{buildroot}
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Mon Sep 04 2023 support <info@wazuh.com> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Wed Sep 06 2023 support <info@wazuh.com> - 4.5.3
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
* Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
* Thu Aug 24 2023 support <info@wazuh.com> - 4.5.1
Expand Down
10 changes: 8 additions & 2 deletions debs/SPECS/wazuh-agent/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@ wazuh-agent (4.7.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html

-- Wazuh, Inc <info@wazuh.com> Sat, 28 Oct 2023 10:32:24 +0000
-- Wazuh, Inc <info@wazuh.com> Tue, 07 Nov 2023 00:00:00 +0000

wazuh-agent (4.6.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html

-- Wazuh, Inc <info@wazuh.com> Mon, 04 Sep 2023 11:56:07 +0000
-- Wazuh, Inc <info@wazuh.com> Mon, 16 Oct 2023 00:00:00 +0000

wazuh-agent (4.5.3-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html

-- Wazuh, Inc <info@wazuh.com> Wed, 06 Sep 2023 00:00:00 +0000

wazuh-agent (4.5.2-RELEASE) stable; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-agent/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <info@wazuh.com> on Sat, 28 Oct 2023 10:32:24 +0000
Wazuh, Inc <info@wazuh.com> on Tue, 07 Nov 2023 00:00:00 +0000

It was downloaded from:

Expand Down
10 changes: 8 additions & 2 deletions debs/SPECS/wazuh-manager/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@ wazuh-manager (4.7.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html

-- Wazuh, Inc <info@wazuh.com> Sat, 28 Oct 2023 10:32:24 +0000
-- Wazuh, Inc <info@wazuh.com> Tue, 07 Nov 2023 00:00:00 +0000

wazuh-manager (4.6.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html

-- Wazuh, Inc <info@wazuh.com> Fri, 08 Sep 2023 13:46:52 +0000
-- Wazuh, Inc <info@wazuh.com> Mon, 16 Oct 2023 00:00:00 +0000

wazuh-manager (4.5.3-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html

-- Wazuh, Inc <info@wazuh.com> Wed, 06 Sep 2023 00:00:00 +0000

wazuh-manager (4.5.2-RELEASE) stable; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-manager/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <info@wazuh.com> on Sat, 28 Oct 2023 10:32:24 +0000
Wazuh, Inc <info@wazuh.com> on Tue, 07 Nov 2023 00:00:00 +0000

It was downloaded from:

Expand Down
2 changes: 1 addition & 1 deletion macos/specs/wazuh-agent-intel64.pkgproj
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
<string>4.5.1-1</string>
<string>4.6.0-1</string>
</dict>
<key>TYPE</key>
<integer>0</integer>
Expand Down
5 changes: 2 additions & 3 deletions ova/assets/custom/grub/grub
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

GRUB_CMDLINE_LINUX="console=tty12"
GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 nvme_core.io_timeout=4294967295 rd.emergency=poweroff quiet splash rd.plymouth=0 plymouth.enable=0 loglevel=0 systemd.show_status=0 systemd.log_level=0 vt.cur_default=0 rd.shell=0 root=/dev/sda1"
GRUB_DEFAULT=0
GRUB_TIMEOUT=0
GRUB_HIDDEN_TIMEOUT=2
GRUB_DISABLE_RECOVERY="true"
GRUB_DISABLE_SUBMENU=y
GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 biosdevname=0 quiet splash rd.plymouth=0 plymouth.enable=0 loglevel=0 systemd.show_status=0 systemd.log_level=0 vt.cur_default=0"
GRUB_DISABLE_LINUX_UUID=true
GRUB_BACKGROUND="/boot/grub2/wazuh.png"
6 changes: 4 additions & 2 deletions rpms/SPECS/wazuh-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -599,10 +599,12 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*

%changelog
* Sat Oct 28 2023 support <info@wazuh.com> - 4.7.0
* Tue Nov 07 2023 support <info@wazuh.com> - 4.7.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Mon Sep 04 2023 support <info@wazuh.com> - 4.6.0
* Mon Oct 16 2023 support <info@wazuh.com> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Wed Sep 06 2023 support <info@wazuh.com> - 4.5.3
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
* Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
* Thu Aug 24 2023 support <info@wazuh.com> - 4.5.1
Expand Down
6 changes: 4 additions & 2 deletions rpms/SPECS/wazuh-manager.spec
Original file line number Diff line number Diff line change
Expand Up @@ -822,10 +822,12 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*

%changelog
* Sat Oct 28 2023 support <info@wazuh.com> - 4.7.0
* Tue Nov 07 2023 support <info@wazuh.com> - 4.7.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Mon Sep 04 2023 support <info@wazuh.com> - 4.6.0
* Mon Oct 16 2023 support <info@wazuh.com> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Wed Sep 06 2023 support <info@wazuh.com> - 4.5.3
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
* Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
* Thu Aug 24 2023 support <info@wazuh.com> - 4.5.1
Expand Down
2 changes: 1 addition & 1 deletion solaris/solaris10/pkginfo
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARCH="i386"
CLASSES="none"
CATEGORY="system"
VENDOR="Wazuh, Inc <info@wazuh.com>"
PSTAMP="28Oct2023"
PSTAMP="07Nov2023"
EMAIL="info@wazuh.com"
ISTATES="S s 1 2 3"
RSTATES="S s 1 2 3"
Expand Down
8 changes: 4 additions & 4 deletions stack/dashboard/base/builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ revision="$2"
future="$3"
repository="$4"
reference="$5"
opensearch_version="2.6.0"
opensearch_version="2.8.0"
base_dir=/opt/wazuh-dashboard-base

# -----------------------------------------------------------------------------
Expand Down Expand Up @@ -90,11 +90,11 @@ cp ./etc/styles.js ./src/core/server/rendering/views/styles.js
sed -i "s|defaultValue: ''|defaultValue: \'Wazuh\'|g" ./src/core/server/opensearch_dashboards_config.js
sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensearch_dashboards_config.js
# Replace config path
sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards
sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards-keystore
sed -i "s'\$DIR/config'/etc/wazuh-dashboard'g" ./bin/opensearch-dashboards-plugin
sed -i "s'NODE_OPTIONS=\"--no-warnings --max-http-header-size=65536 \$OSD_NODE_OPTS \$NODE_OPTIONS\" NODE_ENV=production exec \"\${NODE}\" \"\${DIR}/src/cli/dist\" \${@}'NODE_OPTIONS=\"--no-warnings --max-http-header-size=65536 \$OSD_NODE_OPTS \$NODE_OPTIONS\"'g" ./bin/opensearch-dashboards
echo "NODE_ENV=production exec \"\${NODE}\" \${NODE_OPTIONS} \"\${DIR}/src/cli/dist\" \${@}" >> ./bin/opensearch-dashboards
# Add fix to Node variables as Node is not using the NODE_OPTIONS environment variables
sed -i 's/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"/NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"\n/g' ./bin/use_node
sed -i 's/exec "${NODE}"/NODE_ENV=production exec "${NODE}" ${NODE_OPTIONS} /g' ./bin/use_node
# Replace the redirection to `home` in the header logo
sed -i "s'/app/home'/app/wazuh'g" ./src/core/target/public/core.entry.js
# Replace others redirections to `home`
Expand Down
2 changes: 1 addition & 1 deletion stack/dashboard/base/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN yum install -y \
jq \
unzip

RUN git clone https://github.com/google/brotli.git
RUN git clone https://github.com/google/brotli.git -b v1.0.9

RUN cd brotli && chmod +x ./bootstrap && ./bootstrap && ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --libexecdir=/usr/lib64/brotli --libdir=/usr/lib64/brotli --datarootdir=/usr/share --mandir=/usr/share/man/man1 --docdir=/usr/share/doc \
&& make && make install
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ User=wazuh-dashboard
Group=wazuh-dashboard
EnvironmentFile=-/etc/default/wazuh-dashboard
EnvironmentFile=-/etc/sysconfig/wazuh-dashboard
ExecStart=/usr/share/wazuh-dashboard/bin/opensearch-dashboards "-c /etc/wazuh-dashboard/opensearch_dashboards.yml"
ExecStart=/usr/share/wazuh-dashboard/bin/opensearch-dashboards -c /etc/wazuh-dashboard/opensearch_dashboards.yml
WorkingDirectory=/usr/share/wazuh-dashboard

[Install]
Expand Down
12 changes: 9 additions & 3 deletions stack/dashboard/deb/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
wazuh-dashboard (VERSION-RELEASE) stable; urgency=low
wazuh-dashboard (4.7.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html

-- Wazuh, Inc <info@wazuh.com> Sat, 28 Oct 2023 10:32:24 +0000
-- Wazuh, Inc <info@wazuh.com> Tue, 07 Nov 2023 00:00:00 +0000

wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html

-- Wazuh, Inc <info@wazuh.com> Mon, 04 Sep 2023 11:56:07 +0000
-- Wazuh, Inc <info@wazuh.com> Mon, 16 Oct 2023 00:00:00 +0000

wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html

-- Wazuh, Inc <info@wazuh.com> Wed, 06 Sep 2023 00:00:00 +0000

wazuh-dashboard (4.5.2-RELEASE) stable; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion stack/dashboard/deb/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <info@wazuh.com> on Sat, 28 Oct 2023 10:32:24 +0000
Wazuh, Inc <info@wazuh.com> on Tue, 07 Nov 2023 00:00:00 +0000

It was downloaded from:

Expand Down
6 changes: 5 additions & 1 deletion stack/dashboard/deb/debian/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,14 @@ case "$1" in
service wazuh-dashboard restart > /dev/null 2>&1
fi
fi
if [ ! -f "${INSTALLATION_DIR}"/config/opensearch_dashboards.keystore ]; then
# Move keystore file if upgrade (file exists in install dir in <= 4.6.0)
if [ -f "${INSTALLATION_DIR}"/config/opensearch_dashboards.keystore ]; then
mv "${INSTALLATION_DIR}"/config/opensearch_dashboards.keystore "${CONFIG_DIR}"/opensearch_dashboards.keystore
elif [ ! -f "${CONFIG_DIR}"/opensearch_dashboards.keystore ]; then
runuser "${NAME}" --shell="/bin/bash" --command="${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore create" > /dev/null 2>&1
runuser "${NAME}" --shell="/bin/bash" --command="echo kibanaserver | ${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore add opensearch.username --stdin" > /dev/null 2>&1
runuser "${NAME}" --shell="/bin/bash" --command="echo kibanaserver | ${INSTALLATION_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" > /dev/null 2>&1
chmod 640 "${CONFIG_DIR}"/opensearch_dashboards.keystore
fi
;;

Expand Down
4 changes: 3 additions & 1 deletion stack/dashboard/deb/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ override_dh_install:
useradd -g $(GROUP) $(USER)

tar -xf $(DASHBOARD_FILE)
sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards"
sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore"

mkdir -p $(TARGET_DIR)$(CONFIG_DIR)
mkdir -p $(TARGET_DIR)$(INSTALLATION_DIR)
Expand Down Expand Up @@ -104,7 +106,7 @@ override_dh_fixperms:
chmod 750 $(TARGET_DIR)/etc/default/wazuh-dashboard
chmod 640 "$(TARGET_DIR)$(CONFIG_DIR)"/opensearch_dashboards.yml
chmod 640 "$(TARGET_DIR)$(CONFIG_DIR)"/node.options
chmod 640 $(TARGET_DIR)/etc/systemd/system/wazuh-dashboard.service
chmod 640 "$(TARGET_DIR)"/etc/systemd/system/wazuh-dashboard.service
find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type d -exec chmod 750 {} \;
find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type f -perm 644 -exec chmod 640 {} \;
find "$(TARGET_DIR)$(INSTALLATION_DIR)" -type f -perm 755 -exec chmod 750 {} \;
Expand Down
9 changes: 6 additions & 3 deletions stack/dashboard/rpm/docker/x86_64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
FROM rockylinux:8.5
FROM amd64/centos:7

# Enable EPEL
RUN yum install -y http://packages.wazuh.com/utils/pkg/epel-release-latest-7.noarch.rpm

# Install all the necessary tools to build the packages
RUN yum clean all && yum update -y
RUN yum install -y openssh-clients sudo gnupg \
yum-utils epel-release redhat-rpm-config rpm-devel \
yum-utils redhat-rpm-config rpm-devel \
zlib zlib-devel rpm-build autoconf automake \
glibc-devel libtool perl

RUN yum install -y https://repo.ius.io/ius-release-el$(rpm -E '%{rhel}').rpm
RUN yum install -y https://repo.ius.io/ius-release-el$(rpm -E '%{rhel}').rpm

RUN yum update -y && yum install -y python3

Expand Down
27 changes: 19 additions & 8 deletions stack/dashboard/rpm/wazuh-dashboard.spec
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ useradd -g %{GROUP} %{USER}

tar -xf %{DASHBOARD_FILE}

# Set custom config dir
sed -i 's/OSD_NODE_OPTS_PREFIX/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_NODE_OPTS_PREFIX/g' "wazuh-dashboard-base/bin/opensearch-dashboards"
sed -i 's/OSD_USE_NODE_JS_FILE_PATH/OSD_PATH_CONF="\/etc\/wazuh-dashboard" OSD_USE_NODE_JS_FILE_PATH/g' "wazuh-dashboard-base/bin/opensearch-dashboards-keystore"

# -----------------------------------------------------------------------------

%install
Expand Down Expand Up @@ -132,12 +136,6 @@ fi
%post
setcap 'cap_net_bind_service=+ep' %{INSTALL_DIR}/node/bin/node

if [ ! -f %{INSTALLATION_DIR}/config/opensearch_dashboards.keystore ]; then
runuser %{USER} --shell="/bin/bash" --command="%{INSTALL_DIR}/bin/opensearch-dashboards-keystore create" > /dev/null 2>&1
runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.username --stdin" > /dev/null 2>&1
runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" > /dev/null 2>&1
fi

# -----------------------------------------------------------------------------

%preun
Expand Down Expand Up @@ -183,6 +181,16 @@ if [ ! -d %{PID_DIR} ]; then
chown %{USER}:%{GROUP} %{PID_DIR}
fi

# Move keystore file if upgrade (file exists in install dir in <= 4.6.0)
if [ -f "%{INSTALL_DIR}"/config/opensearch_dashboards.keystore ]; then
mv "%{INSTALL_DIR}"/config/opensearch_dashboards.keystore "%{CONFIG_DIR}"/opensearch_dashboards.keystore
elif [ ! -f %{CONFIG_DIR}/opensearch_dashboards.keystore ]; then
runuser %{USER} --shell="/bin/bash" --command="%{INSTALL_DIR}/bin/opensearch-dashboards-keystore create" > /dev/null 2>&1
runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.username --stdin" > /dev/null 2>&1
runuser %{USER} --shell="/bin/bash" --command="echo kibanaserver | %{INSTALL_DIR}/bin/opensearch-dashboards-keystore add opensearch.password --stdin" > /dev/null 2>&1
chmod 640 "%{CONFIG_DIR}"/opensearch_dashboards.keystore
fi

if [ -f %{INSTALL_DIR}/wazuh-dashboard.restart ]; then
rm -f %{INSTALL_DIR}/wazuh-dashboard.restart
if command -v systemctl > /dev/null 2>&1 && systemctl > /dev/null 2>&1; then
Expand Down Expand Up @@ -391,6 +399,7 @@ rm -fr %{buildroot}
%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/LICENSE.txt"
%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/NOTICE.txt"
%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/README.txt"
%attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/use_node"
%attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/opensearch-dashboards"
%attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/opensearch-dashboards-plugin"
%attr(750, %{USER}, %{GROUP}) "%{INSTALL_DIR}/bin/opensearch-dashboards-keystore"
Expand All @@ -399,10 +408,12 @@ rm -fr %{buildroot}
%attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service"

%changelog
* Mon Sep 04 2023 support <info@wazuh.com> - %{version}
* Tue Nov 07 2023 support <info@wazuh.com> - 4.7.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
* Sat Oct 28 2023 support <info@wazuh.com> - 4.6.0
* Mon Oct 16 2023 support <info@wazuh.com> - 4.6.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
* Wed Sep 06 2023 support <info@wazuh.com> - 4.5.3
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
* Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
* Thu Aug 24 2023 support <info@wazuh.com> - 4.5.1
Expand Down
10 changes: 8 additions & 2 deletions stack/indexer/base/builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ architecture="$1"
revision="$2"
future="$3"
reference="$4"
opensearch_version="2.6.0"
opensearch_version="2.8.0"
base_dir=/opt/wazuh-indexer-base

# -----------------------------------------------------------------------------
Expand Down Expand Up @@ -58,7 +58,7 @@ find -type l -exec rm -rf {} \;
find -name "*.bat" -exec rm -rf {} \;
rm -rf README.md manifest.yml opensearch-tar-install.sh logs
sed -i 's|OPENSEARCH_DISTRIBUTION_TYPE=tar|OPENSEARCH_DISTRIBUTION_TYPE=rpm|g' bin/opensearch-env
sed -i 's|"$OPENSEARCH_HOME"/config|/etc/wazuh-indexer|g' bin/opensearch-env
sed -i 's|"$OPENSEARCH_HOME"/config|/etc/wazuh-indexer|g' bin/opensearch-env
cp -r /root/stack/indexer/base/files/systemd-entrypoint bin/
mkdir -p ./etc/wazuh-indexer/
cp -r ./config/* ./etc/wazuh-indexer/
Expand All @@ -85,6 +85,12 @@ sed -i 's|-SNAPSHOT||g' "${base_dir}"/modules/systemd/plugin-descriptor.properti
cd "${base_dir}"
rm -rf OpenSearch

find -type d -exec chmod 750 {} \;
find -type f -perm 644 -exec chmod 640 {} \;
find -type f -perm 664 -exec chmod 660 {} \;
find -type f -perm 755 -exec chmod 750 {} \;
find -type f -perm 744 -exec chmod 740 {} \;

# -----------------------------------------------------------------------------

# Base output
Expand Down
Loading

0 comments on commit 1733100

Please sign in to comment.