Skip to content

Commit 22ad2f8

Browse files
f-gallandAlexRuiz7
andcommitted
Fix RPM package references to /var/run (#119)
* Switch /var/run references to /run * Remove unneeded files from assembled packages (#115) * add remove files function to assemble.sh * Remove unneeded files on assembled tar packages * Remove duplicated function Fix wrong variable assignment --------- Co-authored-by: Álex Ruiz <[email protected]> * Add missing tools and files back into Wazuh Indexer packages (#117) * add remove files function to assemble.sh * Remove unneeded files on assembled tar packages * Remove duplicated function Fix wrong variable assignment * Adding function to package Wazuh`s tools to assemble.sh * Make the files' versions follow the repo's VERSION file * Fix download of Wazuh tools for packages assembly --------- Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> * Remove unneeded symbolic links from assembled packages (#121) * Remove reference to install_demo_configuration.sh --------- Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Álex Ruiz <[email protected]>
1 parent 156d2c1 commit 22ad2f8

File tree

7 files changed

+7
-11
lines changed

7 files changed

+7
-11
lines changed

distribution/packages/src/common/env/wazuh-indexer

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
OPENSEARCH_PATH_CONF=${path.conf}
1414

1515
# wazuh-indexer PID directory
16-
#PID_DIR=/var/run/wazuh-indexer
16+
#PID_DIR=/run/wazuh-indexer
1717

1818
# Additional Java OPTS
1919
#OPENSEARCH_JAVA_OPTS=

distribution/packages/src/common/scripts/postrm

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ if [ "$REMOVE_DIRS" = "true" ]; then
7272
echo " OK"
7373
fi
7474

75-
if [ -d /var/run/wazuh-indexer ]; then
75+
if [ -d /run/wazuh-indexer ]; then
7676
echo -n "Deleting PID directory..."
77-
rm -rf /var/run/wazuh-indexer
77+
rm -rf /run/wazuh-indexer
7878
echo " OK"
7979
fi
8080

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d /var/run/wazuh-indexer 0750 wazuh-indexer wazuh-indexer - -
1+
d /run/wazuh-indexer 0750 wazuh-indexer wazuh-indexer - -

distribution/packages/src/common/systemd/wazuh-indexer.service

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RuntimeDirectory=wazuh-indexer
1010
PrivateTmp=true
1111
Environment=OPENSEARCH_HOME=/usr/share/wazuh-indexer
1212
Environment=OPENSEARCH_PATH_CONF=${path.conf}
13-
Environment=PID_DIR=/var/run/wazuh-indexer
13+
Environment=PID_DIR=/run/wazuh-indexer
1414
Environment=OPENSEARCH_SD_NOTIFY=true
1515
EnvironmentFile=-${path.env}
1616

distribution/packages/src/deb/debmake_install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ product_dir=/usr/share/wazuh-indexer
2121
# config_dir=/etc/wazuh-indexer
2222
data_dir=/var/lib/wazuh-indexer
2323
log_dir=/var/log/wazuh-indexer
24-
pid_dir=/var/run/wazuh-indexer
24+
pid_dir=/run/wazuh-indexer
2525
buildroot=${curdir}/debian/wazuh-indexer
2626

2727
# Create necessary directories

distribution/packages/src/rpm/init.d/wazuh-indexer

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ MAX_OPEN_FILES=65535
3939
MAX_MAP_COUNT=262144
4040
OPENSEARCH_PATH_CONF="${path.conf}"
4141

42-
PID_DIR="/var/run/wazuh-indexer"
42+
PID_DIR="/run/wazuh-indexer"
4343

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

distribution/packages/src/rpm/wazuh-indexer.rpm.spec

-4
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,6 @@ exit 0
104104

105105
%post
106106
set -e
107-
# Apply Security Settings
108-
if [ -d %{product_dir}/plugins/opensearch-security ]; then
109-
sh %{product_dir}/plugins/opensearch-security/tools/install_demo_configuration.sh -y -i -s > %{log_dir}/install_demo_configuration.log 2>&1
110-
fi
111107
chown -R %{name}.%{name} %{config_dir}
112108
chown -R %{name}.%{name} %{log_dir}
113109
# Apply PerformanceAnalyzer Settings

0 commit comments

Comments
 (0)