From 13a346da1944fb03073ad70f1c5020347556c5b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Wed, 25 Sep 2024 18:39:54 +0200 Subject: [PATCH] Swap reporting plugin in wazuh-indexer package (specs) --- distribution/packages/src/deb/debmake_install.sh | 4 ++-- distribution/packages/src/rpm/wazuh-indexer.rpm.spec | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/distribution/packages/src/deb/debmake_install.sh b/distribution/packages/src/deb/debmake_install.sh index 6bc8e89d48f68..132edfeca273d 100644 --- a/distribution/packages/src/deb/debmake_install.sh +++ b/distribution/packages/src/deb/debmake_install.sh @@ -69,8 +69,8 @@ if [ -e "${buildroot}/${config_dir}/opensearch-observability/observability.yml" chmod -c 660 "${buildroot}/${config_dir}/opensearch-observability/observability.yml" fi -if [ -e "${buildroot}/${config_dir}/opensearch-reports-scheduler/reports-scheduler.yml" ]; then - chmod -c 660 "${buildroot}/${config_dir}/opensearch-reports-scheduler/reports-scheduler.yml" +if [ -e "${buildroot}/${config_dir}/wazuh-indexer-reports-scheduler/reports-scheduler.yml" ]; then + chmod -c 660 "${buildroot}/${config_dir}/wazuh-indexer-reports-scheduler/reports-scheduler.yml" fi # Files that need other permissions diff --git a/distribution/packages/src/rpm/wazuh-indexer.rpm.spec b/distribution/packages/src/rpm/wazuh-indexer.rpm.spec index 8aa28bb3c1615..b6030be89852d 100644 --- a/distribution/packages/src/rpm/wazuh-indexer.rpm.spec +++ b/distribution/packages/src/rpm/wazuh-indexer.rpm.spec @@ -57,7 +57,7 @@ For more information, see: https://www.wazuh.com/ %build %define observability_plugin %( if [ -f %{_topdir}/etc/wazuh-indexer/opensearch-observability/observability.yml ]; then echo "1" ; else echo "0"; fi ) -%define reportsscheduler_plugin %( if [ -f %{_topdir}/etc/wazuh-indexer/opensearch-reports-scheduler/reports-scheduler.yml ]; then echo "1" ; else echo "0"; fi ) +%define reportsscheduler_plugin %( if [ -f %{_topdir}/etc/wazuh-indexer/wazuh-indexer-reports-scheduler/reports-scheduler.yml ]; then echo "1" ; else echo "0"; fi ) %install set -e @@ -77,7 +77,7 @@ fi # Pre-populate the folders to ensure rpm build success even without all plugins mkdir -p %{buildroot}%{config_dir}/opensearch-observability -mkdir -p %{buildroot}%{config_dir}/opensearch-reports-scheduler +mkdir -p %{buildroot}%{config_dir}/wazuh-indexer-reports-scheduler mkdir -p %{buildroot}%{product_dir}/performance-analyzer-rca # Pre-populate PA configs if not present @@ -144,7 +144,7 @@ if [ %observability_plugin -eq 1 ]; then fi if [ %reportsscheduler_plugin -eq 1 ]; then - set -- "$@" "%{config_dir}/opensearch-reports-scheduler/reports-scheduler.yml" + set -- "$@" "%{config_dir}/wazuh-indexer-reports-scheduler/reports-scheduler.yml" fi for i in "$@" @@ -251,7 +251,7 @@ exit 0 %endif %if %reportsscheduler_plugin -%config(noreplace) %attr(660, %{name}, %{name}) %{config_dir}/opensearch-reports-scheduler/reports-scheduler.yml +%config(noreplace) %attr(660, %{name}, %{name}) %{config_dir}/wazuh-indexer-reports-scheduler/reports-scheduler.yml %endif