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

Add wazuh-template.json to packages #116

Merged
merged 10 commits into from
Jan 19, 2024
Merged

Add wazuh-template.json to packages #116

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9b6a510
Download wazuh-template.json from wazuh/wazuh repo
f-galland Jan 11, 2024
939cdbd
Add wazuh-template.json to RPM package spec
f-galland Jan 15, 2024
3be840a
Setting wazuh-template.json attributes to 660
f-galland Jan 16, 2024
11fcf39
Change wazuh-template.json attributes in debmake_install.sh
f-galland Jan 16, 2024
9c6bb78
Merge branch '4.9.0' into 82-add-wazuh-template-to-packages
AlexRuiz7 Jan 17, 2024
a246f0b
Put template download command within a function
f-galland Jan 17, 2024
3219452
Merge branch '4.9.0' into 82-add-wazuh-template-to-packages
AlexRuiz7 Jan 18, 2024
80772be
Small fixes and format
AlexRuiz7 Jan 18, 2024
8db4447
Apply correct file permissions to the wazuh-template.json
AlexRuiz7 Jan 18, 2024
b9f3702
Merge branch '4.9.0' into 82-add-wazuh-template-to-packages
AlexRuiz7 Jan 19, 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
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,7 @@ testfixtures_shared/
.ci/jobs/

# build files generated
doc-tools/missing-doclet/bin/
doc-tools/missing-doclet/bin/

# Wazuh template (currently downloaded from the wazuh/wazuh repo directly)
distribution/src/config/wazuh-template.json
3 changes: 2 additions & 1 deletion distribution/packages/src/deb/debmake_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi

curdir=$1
product_dir=/usr/share/wazuh-indexer
# config_dir=/etc/wazuh-indexer
config_dir=/etc/wazuh-indexer
data_dir=/var/lib/wazuh-indexer
log_dir=/var/log/wazuh-indexer
pid_dir=/var/run/wazuh-indexer
Expand All @@ -35,6 +35,7 @@ chmod -c 0755 "${buildroot}${product_dir}"/bin/*
if [ -d "${buildroot}${product_dir}"/plugins/opensearch-security ]; then
chmod -c 0755 "${buildroot}${product_dir}"/plugins/opensearch-security/tools/*
fi
chmod -c 660 "${buildroot}${config_dir}"/wazuh-template.json

# Change Permissions
chmod -Rf a+rX,u+w,g-w,o-w "${buildroot}"/*
AlexRuiz7 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
13 changes: 8 additions & 5 deletions distribution/packages/src/rpm/wazuh-indexer.rpm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,10 @@ mkdir -p %{buildroot}%{pid_dir}
mkdir -p %{buildroot}%{product_dir}/plugins
# Install directories/files
cp -a etc usr var %{buildroot}
chmod 0755 %{buildroot}%{product_dir}/bin/*
chmod 0750 %{buildroot}%{product_dir}/bin/*
if [ -d %{buildroot}%{product_dir}/plugins/opensearch-security ]; then
chmod 0755 %{buildroot}%{product_dir}/plugins/opensearch-security/tools/*
chmod 0640 %{buildroot}%{product_dir}/plugins/opensearch-security/tools/*
chmod 0740 %{buildroot}%{product_dir}/plugins/opensearch-security/tools/*.sh
fi
# Pre-populate the folders to ensure rpm build success even without all plugins
mkdir -p %{buildroot}%{config_dir}/opensearch-observability
Expand Down Expand Up @@ -204,9 +205,11 @@ exit 0

# Wazuh additional files
%attr(440, %{name}, %{name}) %{product_dir}/VERSION
%attr(750, %{name}, %{name}) %{product_dir}/bin/indexer-security-init.sh
%attr(750, %{name}, %{name}) %{product_dir}/bin/indexer-ism-init.sh
%attr(750, %{name}, %{name}) %{product_dir}/bin/indexer-init.sh
## Removing as %{product_dir}/bin is included in line 199
# %attr(750, %{name}, %{name}) %{product_dir}/bin/indexer-security-init.sh
# %attr(750, %{name}, %{name}) %{product_dir}/bin/indexer-ism-init.sh
# %attr(750, %{name}, %{name}) %{product_dir}/bin/indexer-init.sh
AlexRuiz7 marked this conversation as resolved.
Show resolved Hide resolved
%attr(660, %{name}, %{name}) %{config_dir}/wazuh-template.json

%changelog
* Thu Mar 28 2024 support <[email protected]> - 4.9.0
Expand Down
7 changes: 7 additions & 0 deletions scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ while getopts ":h:v:q:s:o:p:a:d:r:" arg; do
r)
REVISION=$OPTARG
;;
b)
BRANCH=$OPTARG
;;
AlexRuiz7 marked this conversation as resolved.
Show resolved Hide resolved
:)
echo "Error: -${OPTARG} requires an argument"
usage
Expand Down Expand Up @@ -96,6 +99,7 @@ cp -r ./build/local-test-repo/org/opensearch "${OUTPUT}"/maven/org
[ -z "$ARCHITECTURE" ] && ARCHITECTURE=$(uname -m)
[ -z "$DISTRIBUTION" ] && DISTRIBUTION="tar"
[ -z "$REVISION" ] && REVISION="1"
[ -z "$BRANCH" ] && BRANCH="master"

case $PLATFORM-$DISTRIBUTION-$ARCHITECTURE in
linux-tar-x64|darwin-tar-x64)
Expand Down Expand Up @@ -162,6 +166,9 @@ esac

echo "Building OpenSearch for $PLATFORM-$DISTRIBUTION-$ARCHITECTURE"


wget -q https://raw.githubusercontent.com/wazuh/wazuh/$BRANCH/extensions/elasticsearch/7.x/wazuh-template.json -O distribution/src/config/wazuh-template.json
AlexRuiz7 marked this conversation as resolved.
Show resolved Hide resolved

./gradlew ":distribution:$TYPE:$TARGET:assemble" -Dbuild.snapshot="$SNAPSHOT" -Dbuild.version_qualifier="$QUALIFIER"

# Copy artifact to dist folder in bundle build output
Expand Down