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

Fix RPM package references to /var/run #119

Merged
merged 6 commits into from
Jan 18, 2024
Merged

Fix RPM package references to /var/run #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d909b0
Switch /var/run references to /run
f-galland Jan 12, 2024
efda221
Remove unneeded files from assembled packages (#115)
f-galland Jan 12, 2024
4c96994
Add missing tools and files back into Wazuh Indexer packages (#117)
f-galland Jan 12, 2024
dadd053
Remove unneeded symbolic links from assembled packages (#121)
f-galland Jan 15, 2024
3b4a1f5
Remove reference to install_demo_configuration.sh
f-galland Jan 16, 2024
aacef77
Merge branch '4.9.0' into 105-fix-rpm-package-legacy-directory-warning
AlexRuiz7 Jan 17, 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/env/wazuh-indexer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
OPENSEARCH_PATH_CONF=${path.conf}

# wazuh-indexer PID directory
#PID_DIR=/var/run/wazuh-indexer
#PID_DIR=/run/wazuh-indexer

# Additional Java OPTS
#OPENSEARCH_JAVA_OPTS=
Expand Down
4 changes: 2 additions & 2 deletions distribution/packages/src/common/scripts/postrm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ if [ "$REMOVE_DIRS" = "true" ]; then
echo " OK"
fi

if [ -d /var/run/wazuh-indexer ]; then
if [ -d /run/wazuh-indexer ]; then
echo -n "Deleting PID directory..."
rm -rf /var/run/wazuh-indexer
rm -rf /run/wazuh-indexer
echo " OK"
fi

Expand Down
2 changes: 1 addition & 1 deletion distribution/packages/src/common/systemd/wazuh-indexer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d /var/run/wazuh-indexer 0750 wazuh-indexer wazuh-indexer - -
d /run/wazuh-indexer 0750 wazuh-indexer wazuh-indexer - -
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 @@ -10,7 +10,7 @@ RuntimeDirectory=wazuh-indexer
PrivateTmp=true
Environment=OPENSEARCH_HOME=/usr/share/wazuh-indexer
Environment=OPENSEARCH_PATH_CONF=${path.conf}
Environment=PID_DIR=/var/run/wazuh-indexer
Environment=PID_DIR=/run/wazuh-indexer
Environment=OPENSEARCH_SD_NOTIFY=true
EnvironmentFile=-${path.env}

Expand Down
2 changes: 1 addition & 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 @@ -21,7 +21,7 @@ product_dir=/usr/share/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
pid_dir=/run/wazuh-indexer
buildroot=${curdir}/debian/wazuh-indexer

# Create necessary directories
Expand Down
2 changes: 1 addition & 1 deletion distribution/packages/src/rpm/init.d/wazuh-indexer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ MAX_OPEN_FILES=65535
MAX_MAP_COUNT=262144
OPENSEARCH_PATH_CONF="${path.conf}"

PID_DIR="/var/run/wazuh-indexer"
PID_DIR="/run/wazuh-indexer"

# Source the default env file
OPENSEARCH_ENV_FILE="${path.env}"
Expand Down
4 changes: 0 additions & 4 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 @@ -104,10 +104,6 @@ exit 0

%post
set -e
# Apply Security Settings
if [ -d %{product_dir}/plugins/opensearch-security ]; then
sh %{product_dir}/plugins/opensearch-security/tools/install_demo_configuration.sh -y -i -s > %{log_dir}/install_demo_configuration.log 2>&1
fi
chown -R %{name}.%{name} %{config_dir}
chown -R %{name}.%{name} %{log_dir}
# Apply PerformanceAnalyzer Settings
Expand Down