From 58219ef59f4521bb933e45fd3be5b2286f37e770 Mon Sep 17 00:00:00 2001 From: Federico Gustavo Galland <99492720+f-galland@users.noreply.github.com> Date: Mon, 15 Jan 2024 14:48:27 -0300 Subject: [PATCH] Remove unneeded symbolic links from assembled packages (#121) --- distribution/packages/src/deb/debmake_install.sh | 4 ---- distribution/packages/src/rpm/wazuh-indexer.rpm.spec | 10 ++-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/distribution/packages/src/deb/debmake_install.sh b/distribution/packages/src/deb/debmake_install.sh index 4b10a36e001c4..021a31e260d15 100644 --- a/distribution/packages/src/deb/debmake_install.sh +++ b/distribution/packages/src/deb/debmake_install.sh @@ -36,10 +36,6 @@ if [ -d "${buildroot}${product_dir}"/plugins/opensearch-security ]; then chmod -c 0755 "${buildroot}${product_dir}"/plugins/opensearch-security/tools/* fi -# Symlinks (do not symlink config dir as security demo installer has dependency, if no presense it will switch to rpm/deb mode) -ln -s ${data_dir} "${buildroot}${product_dir}/data" -ln -s ${log_dir} "${buildroot}${product_dir}/logs" - # Change Permissions chmod -Rf a+rX,u+w,g-w,o-w "${buildroot}"/* diff --git a/distribution/packages/src/rpm/wazuh-indexer.rpm.spec b/distribution/packages/src/rpm/wazuh-indexer.rpm.spec index c1f196577212a..28be42bbb9fc4 100644 --- a/distribution/packages/src/rpm/wazuh-indexer.rpm.spec +++ b/distribution/packages/src/rpm/wazuh-indexer.rpm.spec @@ -72,9 +72,7 @@ fi mkdir -p %{buildroot}%{config_dir}/opensearch-observability mkdir -p %{buildroot}%{config_dir}/opensearch-reports-scheduler mkdir -p %{buildroot}%{product_dir}/performance-analyzer-rca -# Symlinks (do not symlink config dir as security demo installer has dependency, if no presense it will switch to rpm/deb mode) -ln -s %{data_dir} %{buildroot}%{product_dir}/data -ln -s %{log_dir} %{buildroot}%{product_dir}/logs + # Pre-populate PA configs if not present if [ ! -f %{buildroot}%{data_dir}/rca_enabled.conf ]; then echo 'true' > %{buildroot}%{data_dir}/rca_enabled.conf @@ -204,10 +202,6 @@ exit 0 %{pid_dir} %dir %{data_dir} -# Symlinks -%{product_dir}/data -%{product_dir}/logs - # Wazuh additional files %attr(440, %{name}, %{name}) %{product_dir}/VERSION %attr(750, %{name}, %{name}) %{product_dir}/bin/indexer-security-init.sh @@ -271,4 +265,4 @@ exit 0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-3-1.html * Thu May 05 2022 support - 4.3.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-3-0.html -- Initial package \ No newline at end of file +- Initial package