From fdf6455b74ca0dad29fea77c4a557855f58e4b51 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 27 Apr 2018 14:10:01 +0200
Subject: [PATCH] Added tentacle configuration file to RedHat RPM

---
 pandora_server/pandora_server.redhat.spec | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 1d9a743326..5c8c0bf310 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -48,6 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pandora/
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tentacle/
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/pandora/data_in
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/pandora/data_in/conf
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/pandora/data_in/md5
@@ -81,6 +82,7 @@ rm -f $RPM_BUILD_ROOT%{prefix}/pandora_server/util/recon_scripts/PandoraFMS
 
 install -m 0644 util/pandora_server_logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pandora_server
 install -m 0640 conf/pandora_server.conf.new $RPM_BUILD_ROOT%{_sysconfdir}/pandora/pandora_server.conf.new
+install -m 0640 conf/tentacle_server.conf.new $RPM_BUILD_ROOT%{_sysconfdir}/tentacle/tentacle_server.conf.new
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d
 chmod 0750 $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d
@@ -119,8 +121,8 @@ if [ "$1" = 1 ]; then
    echo " "
 fi
 
-# This will avoid pandora_server.conf overwritting on UPGRADES.
-
+# This will avoid confi files overwritting on UPGRADES.
+# Main configuration file
 if [ ! -e "/etc/pandora/pandora_server.conf" ]
 then
         echo "Creating a new version of Pandora FMS Server config file at /etc/pandora/pandora_server.conf"
@@ -130,6 +132,12 @@ else
         echo "An existing version of pandora_server.conf is found."
         cat /etc/pandora/pandora_server.conf > /etc/pandora/pandora_server.conf.old
 fi
+# Tentacle server
+if [ ! -e "/etc/tentacle/tentacle_server.conf" ]
+then
+        echo "Creating a new version of Tentacle Server config file at /etc/tentacle/tentacle_server.conf"
+        cat /etc/tentacle/tentacle_server.conf.new > /etc/tentacle/tentacle_server.conf
+fi
 
 echo "Don't forget to start Tentacle Server daemon if you want to receive"
 echo "data using tentacle"
@@ -174,6 +182,7 @@ exit 0
 
 %defattr(600,root,root)
 /etc/pandora/pandora_server.conf.new
+/etc/tentacle/tentacle_server.conf.new
 
 %defattr(-,pandora,apache,2770)
 %{_localstatedir}/spool/pandora