Merge branch '4.10.0' into merge-4.9.2-into-4.10.0

Signed-off-by: Álex Ruiz <[email protected]>

CHANGELOG.md

@@ -19,4 +19,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Security
 
+
 [Unreleased 4.10.x]: https://github.com/wazuh/wazuh-indexer/compare/b39a219a318a2b9101fa146eb195192a945963d7...4.10.0

distribution/packages/src/deb/debian/postinst

@@ -19,7 +19,7 @@ data_dir=/var/lib/wazuh-indexer
 log_dir=/var/log/wazuh-indexer
 pid_dir=/run/wazuh-indexer
 tmp_dir=/var/log/wazuh-indexer/tmp
-
+restart_service=/tmp/wazuh-indexer.restart
 
 # Create needed directories
 mkdir -p ${tmp_dir}
@@ -46,6 +46,15 @@ if command -v systemd-tmpfiles > /dev/null; then
     systemd-tmpfiles --create wazuh-indexer.conf
 fi
 
+if [ -f $restart_service ]; then
+    rm -f $restart_service
+    echo "Restarting wazuh-indexer service..."
+    if command -v systemctl > /dev/null; then
+        systemctl restart wazuh-indexer.service > /dev/null 2>&1
+    fi
+    exit 0
+fi
+
 # Messages
 echo "### NOT starting on installation, please execute the following statements to configure wazuh-indexer service to start automatically using systemd"
 echo " sudo systemctl daemon-reload"
@@ -54,5 +63,3 @@ echo "### You can start wazuh-indexer service by executing"
 echo " sudo systemctl start wazuh-indexer.service"
 
 exit 0
-
-

distribution/packages/src/deb/debian/preinst

@@ -13,10 +13,14 @@ set -e
 
 echo "Running Wazuh Indexer Pre-Installation Script"
 
+# Reference to restore actual service status
+restart_service=/tmp/wazuh-indexer.restart
+
 # Stop existing service
 if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer.service >/dev/null; then
     echo "Stop existing wazuh-indexer.service"
     systemctl --no-reload stop wazuh-indexer.service
+    touch $restart_service
 fi
 if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer-performance-analyzer.service >/dev/null; then
     echo "Stop existing wazuh-indexer-performance-analyzer.service"

distribution/packages/src/deb/debian/prerm

@@ -11,16 +11,27 @@
 
 set -e
 
-echo "Running Wazuh Indexer Pre-Removal Script"
-
-# Stop existing service
-if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer.service >/dev/null; then
-    echo "Stop existing wazuh-indexer.service"
-    systemctl --no-reload stop wazuh-indexer.service
-fi
-if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer-performance-analyzer.service >/dev/null; then
-    echo "Stop existing wazuh-indexer-performance-analyzer.service"
-    systemctl --no-reload stop wazuh-indexer-performance-analyzer.service
-fi
+case "$1" in
+    upgrade|deconfigure)
+    ;;
+    remove)
+        echo "Running Wazuh Indexer Pre-Removal Script"
+        # Stop existing service
+        if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer.service >/dev/null; then
+            echo "Stop existing wazuh-indexer.service"
+            systemctl --no-reload stop wazuh-indexer.service
+        fi
+        if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer-performance-analyzer.service >/dev/null; then
+            echo "Stop existing wazuh-indexer-performance-analyzer.service"
+            systemctl --no-reload stop wazuh-indexer-performance-analyzer.service
+        fi
+    ;;
+    failed-upgrade)
+    ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
 
 exit 0

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

@@ -162,6 +162,7 @@ set -e
 if command -v systemctl >/dev/null && systemctl is-active %{name}.service >/dev/null; then
     echo "Stop existing %{name}.service"
     systemctl --no-reload stop %{name}.service
+    touch %{tmp_dir}/wazuh-indexer.restart
 fi
 if command -v systemctl >/dev/null && systemctl is-active %{name}-performance-analyzer.service >/dev/null; then
     echo "Stop existing %{name}-performance-analyzer.service"
@@ -204,6 +205,15 @@ if command -v systemd-tmpfiles > /dev/null; then
     systemd-tmpfiles --create %{name}.conf
 fi
 
+if [ -f %{tmp_dir}/wazuh-indexer.restart ]; then
+    rm -f %{tmp_dir}/wazuh-indexer.restart
+    if command -v systemctl > /dev/null; then
+        echo "Restarting wazuh-indexer service..."
+        systemctl restart wazuh-indexer.service > /dev/null 2>&1
+        exit 0
+    fi
+fi
+
 # Messages
 echo "### NOT starting on installation, please execute the following statements to configure wazuh-indexer service to start automatically using systemd"
 echo " sudo systemctl daemon-reload"
@@ -266,7 +276,7 @@ exit 0
 %attr(750, %{name}, %{name}) %{product_dir}/performance-analyzer-rca/bin/*
 
 %changelog
-* Thu Nov 1028 2024 support <[email protected]> - 4.10.0
+* Thu Nov 28 2024 support <[email protected]> - 4.10.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
 * Mon Nov 04 2024 support <[email protected]> - 4.9.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-2.html