Remove references to indexer-ism-init.sh and wazuh-template.json (#281)

* Remove references to indexer-ism-init.sh and wazuh-template.json * Roll back remaining content from ISM rollover+alias feature * Remove commented code --------- Co-authored-by: Álex Ruiz <[email protected]>
wazuh · Jun 28, 2024 · 0541f84 · 0541f84
1 parent 9c429e4
commit 0541f84
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 634 deletions.
diff --git a/.gitignore b/.gitignore
@@ -75,6 +75,3 @@ testfixtures_shared/
 
 # build files generated
 doc-tools/missing-doclet/bin/
-
-# Wazuh template (currently downloaded from the wazuh/wazuh repo directly)
-distribution/src/config/wazuh-template.json
diff --git a/distribution/packages/src/deb/debmake_install.sh b/distribution/packages/src/deb/debmake_install.sh
@@ -90,6 +90,5 @@ for i in "${binary_files[@]}"; do
 	chmod -c 750 "$i"
 done
 
-chmod -c 660 "${buildroot}${config_dir}/wazuh-template.json"
 
 exit 0
diff --git a/distribution/packages/src/rpm/wazuh-indexer.cicd.spec b/distribution/packages/src/rpm/wazuh-indexer.cicd.spec
@@ -689,8 +689,6 @@ rm -fr %{buildroot}
 %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/opensearch-performance-analyzer/performance-analyzer-agent
 %attr(440, %{USER}, %{GROUP}) %{INSTALL_DIR}/VERSION
 %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/indexer-security-init.sh
-%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/indexer-ism-init.sh
-%attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/bin/indexer-init.sh
 %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/config.yml
 %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-certs-tool.sh
 %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-passwords-tool.sh

diff --git a/distribution/packages/src/rpm/wazuh-indexer.rpm.spec b/distribution/packages/src/rpm/wazuh-indexer.rpm.spec
@@ -117,7 +117,6 @@ set -- "$@" "%{_sysconfdir}/sysconfig/%{name}"
 set -- "$@" "%{config_dir}/log4j2.properties"
 set -- "$@" "%{config_dir}/jvm.options"
 set -- "$@" "%{config_dir}/opensearch.yml"
-set -- "$@" "%{config_dir}/wazuh-template.json"
 set -- "$@" "%{product_dir}/VERSION"
 set -- "$@" "%{product_dir}/plugins/opensearch-security/tools/.*\.sh"
 set -- "$@" "%{product_dir}/bin/.*"
@@ -262,7 +261,6 @@ exit 0
 %attr(750, %{name}, %{name}) %{product_dir}/jdk/lib/jspawnhelper
 %attr(750, %{name}, %{name}) %{product_dir}/jdk/lib/modules
 %attr(750, %{name}, %{name}) %{product_dir}/performance-analyzer-rca/bin/*
-%attr(660, %{name}, %{name}) %{config_dir}/wazuh-template.json
 
 %changelog
 * Thu Mar 28 2024 support <[email protected]> - 4.9.0

diff --git a/distribution/src/bin/indexer-init.sh b/distribution/src/bin/indexer-init.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -90,6 +90,5 @@ for i in "${binary_files[@]}"; do @@
     	chmod -c 750 "$i"
     done
-    chmod -c 660 "${buildroot}${config_dir}/wazuh-template.json"
     exit 0