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

Fix startup errors on STIG compliant systems due to noexec filesystems #533

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Fix startup errors on STIG compliant systems due to noexec filesystems #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c31b54
Update packaging scripts to avoid failures when /var/log is noexec
QU3B1M Nov 9, 2024
c996476
Update OPENASEARCH_TMPDIR pointing to new tmp directory's path
QU3B1M Nov 11, 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 distribution/packages/src/common/systemd/wazuh-indexer.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Type=notify
RuntimeDirectory=wazuh-indexer
PrivateTmp=true
Environment=OPENSEARCH_HOME=/usr/share/wazuh-indexer
Environment=OPENSEARCH_TMPDIR=/var/log/wazuh-indexer/tmp
Environment=OPENSEARCH_TMPDIR=/var/lib/wazuh-indexer/tmp
Environment=OPENSEARCH_PATH_CONF=${path.conf}
Environment=PID_DIR=/run/wazuh-indexer
Environment=OPENSEARCH_SD_NOTIFY=true
Expand Down
7 changes: 2 additions & 5 deletions distribution/packages/src/deb/debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@ config_dir=/etc/wazuh-indexer
data_dir=/var/lib/wazuh-indexer
log_dir=/var/log/wazuh-indexer
pid_dir=/run/wazuh-indexer
tmp_dir=/var/log/wazuh-indexer/tmp
restart_service=/tmp/wazuh-indexer.restart

# Create needed directories
mkdir -p ${tmp_dir}
tmp_dir=${data_dir}/tmp
restart_service=${tmp_dir}/wazuh-indexer.restart

# Set owner
chown -R wazuh-indexer:wazuh-indexer ${product_dir}
Expand Down
13 changes: 10 additions & 3 deletions distribution/packages/src/deb/debian/preinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,17 @@

set -e

echo "Running Wazuh Indexer Pre-Installation Script"
# Reference to temp directory
tmp_dir=/var/lib/wazuh-indexer/tmp
restart_service=${tmp_dir}/wazuh-indexer.restart

# Create needed directories
if [ -d ${tmp_dir} ]; then
rm -r ${tmp_dir}
fi
mkdir -p ${tmp_dir}

# Reference to restore actual service status
restart_service=/tmp/wazuh-indexer.restart
echo "Running Wazuh Indexer Pre-Installation Script"

# Stop existing service
if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer.service >/dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -27,7 +27,7 @@
%define data_dir %{_sharedstatedir}/%{name}
%define log_dir %{_localstatedir}/log/%{name}
%define pid_dir %{_localstatedir}/run/%{name}
%define tmp_dir %{log_dir}/tmp
%define tmp_dir %{data_dir}/tmp
%{!?_version: %define _version 0.0.0 }
%{!?_architecture: %define _architecture x86_64 }

Expand Down