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.

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

Ignoring /run and /var/run from the list of packaged directories #286

Merged
merged 4 commits into from
Jul 2, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Changing pid file dir to /var/run/wazuh-indexer
  • Loading branch information
f-galland committed Jul 1, 2024

Verified

This commit was signed with the committer’s verified signature.
ewuerger Ernst Würger
commit 18b1217e31d6fed78a4509a4de8c7071be14b933
2 changes: 1 addition & 1 deletion distribution/packages/src/common/env/wazuh-indexer
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
OPENSEARCH_PATH_CONF=${path.conf}

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

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

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

Original file line number Diff line number Diff line change
@@ -1 +1 @@
d /run/wazuh-indexer 0750 wazuh-indexer wazuh-indexer - -
d /var/run/wazuh-indexer 0750 wazuh-indexer wazuh-indexer - -
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ PrivateTmp=true
Environment=OPENSEARCH_HOME=/usr/share/wazuh-indexer
Environment=OPENSEARCH_TMPDIR=/var/log/wazuh-indexer/tmp
Environment=OPENSEARCH_PATH_CONF=${path.conf}
Environment=PID_DIR=/run/wazuh-indexer
Environment=PID_DIR=/var/run/wazuh-indexer
Environment=OPENSEARCH_SD_NOTIFY=true
EnvironmentFile=-${path.env}

2 changes: 1 addition & 1 deletion distribution/packages/src/deb/debmake_install.sh
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ product_dir="/usr/share/${name}"
config_dir="/etc/${name}"
# data_dir="/var/lib/${name}"
# log_dir="/var/log/${name}"
pid_dir="/run/${name}"
pid_dir="/var/run/${name}"
service_dir="/usr/lib/systemd/system"

buildroot="${curdir}/debian/${name}"
2 changes: 1 addition & 1 deletion distribution/packages/src/rpm/init.d/wazuh-indexer
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ MAX_OPEN_FILES=65535
MAX_MAP_COUNT=262144
OPENSEARCH_PATH_CONF="${path.conf}"

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

# Source the default env file
OPENSEARCH_ENV_FILE="${path.env}"