Skip to content

Commit

Permalink
Merge branch '4.9.0' into 101-wazuh-indexer-user-doesnt-exist
Browse files Browse the repository at this point in the history
  • Loading branch information
f-galland committed Jan 17, 2024
2 parents 385582c + 8b4546e commit 05adb85
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @AlexRuiz7 @gdiazlo
* @wazuh/indexer
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: 🐛 Bug report
about: Create a report to help us improve
title: "[BUG]"
labels: 'bug, untriaged'
labels: ["type/bug", "level/task"]
assignees: ''
---

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: 🎆 Feature request
about: Suggest an idea for this project
title: ''
labels: 'enhancement, untriaged'
labels: ["type/enhancement", "level/task"]
assignees: ''
---

Expand Down
4 changes: 0 additions & 4 deletions distribution/packages/src/deb/debmake_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ if [ -d "${buildroot}${product_dir}"/plugins/opensearch-security ]; then
chmod -c 0755 "${buildroot}${product_dir}"/plugins/opensearch-security/tools/*
fi

# Symlinks (do not symlink config dir as security demo installer has dependency, if no presense it will switch to rpm/deb mode)
ln -s ${data_dir} "${buildroot}${product_dir}/data"
ln -s ${log_dir} "${buildroot}${product_dir}/logs"

# Change Permissions
chmod -Rf a+rX,u+w,g-w,o-w "${buildroot}"/*

Expand Down
10 changes: 2 additions & 8 deletions distribution/packages/src/rpm/wazuh-indexer.rpm.spec
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ fi
mkdir -p %{buildroot}%{config_dir}/opensearch-observability
mkdir -p %{buildroot}%{config_dir}/opensearch-reports-scheduler
mkdir -p %{buildroot}%{product_dir}/performance-analyzer-rca
# Symlinks (do not symlink config dir as security demo installer has dependency, if no presense it will switch to rpm/deb mode)
ln -s %{data_dir} %{buildroot}%{product_dir}/data
ln -s %{log_dir} %{buildroot}%{product_dir}/logs

# Pre-populate PA configs if not present
if [ ! -f %{buildroot}%{data_dir}/rca_enabled.conf ]; then
echo 'true' > %{buildroot}%{data_dir}/rca_enabled.conf
Expand Down Expand Up @@ -204,10 +202,6 @@ exit 0
%{pid_dir}
%dir %{data_dir}

# Symlinks
%{product_dir}/data
%{product_dir}/logs

# Wazuh additional files
%attr(440, %{name}, %{name}) %{product_dir}/VERSION
%attr(750, %{name}, %{name}) %{product_dir}/bin/indexer-security-init.sh
Expand Down Expand Up @@ -271,4 +265,4 @@ exit 0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-3-1.html
* Thu May 05 2022 support <[email protected]> - 4.3.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-3-0.html
- Initial package
- Initial package

0 comments on commit 05adb85

Please sign in to comment.