From d509e119e94399f9fa7f7f97b44376bdb0eb88e5 Mon Sep 17 00:00:00 2001
From: rafael <rafael.ameijeiras@pandorafms.com>
Date: Tue, 11 Jun 2024 13:39:09 +0200
Subject: [PATCH] ent-13901 update community installers

---
 README.md                                         |  2 ++
 extras/deploy-scripts/pandora_agent_deploy_gh.sh  |  4 ++--
 .../pandora_deploy_community_el8_gh.sh            | 14 +++++++-------
 .../pandora_deploy_community_el9_gh.sh            | 14 ++++++++------
 .../deploy-scripts/pandora_deploy_community_gh.sh | 15 +++++++++------
 .../pandora_deploy_community_ubuntu_2204_gh.sh    | 14 ++++----------
 6 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 7c5aaebd0a..35310a3ce2 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@ Pandora FMS has a "commercial" solution, with different features, oriented to co
 
 Installing Pandora FMS from sources is a complex task. Please read the **extras/deploy/INSTALL.md** file follow all the steps described for a proper installation.
 
+[Link to INSTALL.md](https://github.com/pandorafms/pandorafms/blob/develop/extras/deploy-scripts/INSTALL.md)
+
 ### What is Pandora FMS?
 
 Pandora FMS is an open source monitoring application whose origin dates back to 2004. It integrates in the same application the monitoring of different infrastructure elements: networks, applications, servers, web, and other specific data sources such as logs, WMI, Netflow or SNMP traps.
diff --git a/extras/deploy-scripts/pandora_agent_deploy_gh.sh b/extras/deploy-scripts/pandora_agent_deploy_gh.sh
index 5578917739..5d43087150 100644
--- a/extras/deploy-scripts/pandora_agent_deploy_gh.sh
+++ b/extras/deploy-scripts/pandora_agent_deploy_gh.sh
@@ -184,14 +184,14 @@ if [[ $OS_RELEASE =~ 'rhel' ]] || [[ $OS_RELEASE =~ 'fedora' ]]; then
     echo -e "${cyan}Installing agent dependencies...${reset}" ${green}OK${reset}
     
     # Insatall pandora agent  
-    [ "$PANDORA_AGENT_PACKAGE_EL" ] || PANDORA_AGENT_PACKAGE_EL="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_agent_linux-7.0NG.772.noarch.rpm"
+    [ "$PANDORA_AGENT_PACKAGE_EL" ] || PANDORA_AGENT_PACKAGE_EL="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_agent_linux-7.0NG.777.noarch.rpm"
     execute_cmd "$package_manager_cmd install -y ${PANDORA_AGENT_PACKAGE_EL}" 'Installing Pandora FMS agent package'
     #[[ $PANDORA_AGENT_SSL ]] && execute_cmd "$package_manager_cmd install -y perl-IO-Socket-SSL" "Installing SSL libraries for encrypted connection"
 
 fi
 
 if [[ $OS_RELEASE == 'debian' ]]; then
-    [ "$PANDORA_AGENT_PACKAGE_UBUNTU" ] || PANDORA_AGENT_PACKAGE_UBUNTU='https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_agent_linux-7.0NG.772.tar.gz'
+    [ "$PANDORA_AGENT_PACKAGE_UBUNTU" ] || PANDORA_AGENT_PACKAGE_UBUNTU='https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_agent_linux-7.0NG.777.tar.gz'
     execute_cmd "apt update" 'Updating repos'
     execute_cmd "apt install -y perl wget curl unzip procps python3 python3-pip" 'Installing agent dependencies'
     execute_cmd "curl --output pandorafms_agent_linux-7.0NG.tar.gz ${PANDORA_AGENT_PACKAGE_UBUNTU}" 'Downloading Pandora FMS agent package'
diff --git a/extras/deploy-scripts/pandora_deploy_community_el8_gh.sh b/extras/deploy-scripts/pandora_deploy_community_el8_gh.sh
index f981e5a440..92b4ec7c91 100644
--- a/extras/deploy-scripts/pandora_deploy_community_el8_gh.sh
+++ b/extras/deploy-scripts/pandora_deploy_community_el8_gh.sh
@@ -48,9 +48,6 @@ cyan="\e[0;36m"
 yellow="\e[33m"
 reset="\e[0m"
 
-#force lts to install php 8.0
-[ "$PANDORA_LTS" -eq '1' ] && PHPVER=8.0
-
 # Functions
 execute_cmd () {
     local cmd="$1"
@@ -522,19 +519,22 @@ export MYSQL_PWD=$DBPASS
 
 # packages
 
-[ "$PANDORA_SERVER_PACKAGE" ]       || PANDORA_SERVER_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_server-7.0NG.772.x86_64.rpm"
-[ "$PANDORA_CONSOLE_PACKAGE" ]      || PANDORA_CONSOLE_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_console-7.0NG.772.noarch.rpm"
-[ "$PANDORA_AGENT_PACKAGE" ]        || PANDORA_AGENT_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_agent_linux-7.0NG.772.noarch.rpm"
+[ "$PANDORA_SERVER_PACKAGE" ]       || PANDORA_SERVER_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_server-7.0NG.777.x86_64.rpm"
+[ "$PANDORA_CONSOLE_PACKAGE" ]      || PANDORA_CONSOLE_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_console-7.0NG.777.x86_64.rpm"
+[ "$PANDORA_AGENT_PACKAGE" ]        || PANDORA_AGENT_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_agent_linux-7.0NG.777_x86_64.tar.gz"
 
 
 # Downloading Pandora Packages
 execute_cmd "curl -LSs --output pandorafms_server-7.0NG.noarch.rpm ${PANDORA_SERVER_PACKAGE}" "Downloading Pandora FMS Server community"
 execute_cmd "curl -LSs --output pandorafms_console-7.0NG.noarch.rpm ${PANDORA_CONSOLE_PACKAGE}" "Downloading Pandora FMS Console community"
-execute_cmd "curl -LSs --output pandorafms_agent_linux-7.0NG.noarch.rpm ${PANDORA_AGENT_PACKAGE}" "Downloading Pandora FMS Agent community"
+execute_cmd "curl -LSs --output pandorafms_agent_linux-7.0NG.tar.gz ${PANDORA_AGENT_PACKAGE}" "Downloading Pandora FMS Agent community"
 
 # Install Pandora
 execute_cmd "dnf install -y $HOME/pandora_deploy_tmp/pandorafms*.rpm" "Installing Pandora FMS packages"
 
+# Install Pandora Agent
+tar xvfz $HOME/pandora_deploy_tmp/pandorafms_agent_linux-7.0NG.tar.gz &>> $LOGFILE && cd unix && ./pandora_agent_installer --install &>> $LOGFILE ; cd - &>> $LOGFILE
+
 # Enable Services
 execute_cmd "systemctl enable httpd --now" "Enabling HTTPD service"
 execute_cmd "systemctl enable php-fpm --now" "Enabling PHP-FPM service"
diff --git a/extras/deploy-scripts/pandora_deploy_community_el9_gh.sh b/extras/deploy-scripts/pandora_deploy_community_el9_gh.sh
index 6cc4a6531c..c90d21033d 100644
--- a/extras/deploy-scripts/pandora_deploy_community_el9_gh.sh
+++ b/extras/deploy-scripts/pandora_deploy_community_el9_gh.sh
@@ -514,19 +514,21 @@ export MYSQL_PWD=$DBPASS
 
 # packages
 
-[ "$PANDORA_SERVER_PACKAGE" ]       || PANDORA_SERVER_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_server-7.0NG.772.x86_64.rpm"
-[ "$PANDORA_CONSOLE_PACKAGE" ]      || PANDORA_CONSOLE_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_console-7.0NG.772.noarch.rpm"
-[ "$PANDORA_AGENT_PACKAGE" ]        || PANDORA_AGENT_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_agent_linux-7.0NG.772.noarch.rpm"
+[ "$PANDORA_SERVER_PACKAGE" ]       || PANDORA_SERVER_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_server-7.0NG.777.x86_64.rpm"
+[ "$PANDORA_CONSOLE_PACKAGE" ]      || PANDORA_CONSOLE_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_console-7.0NG.777.x86_64.rpm"
+[ "$PANDORA_AGENT_PACKAGE" ]        || PANDORA_AGENT_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_agent_linux-7.0NG.777_x86_64.tar.gz"
 
 
 # Downloading Pandora Packages
 execute_cmd "curl -LSs --output pandorafms_server-7.0NG.noarch.rpm ${PANDORA_SERVER_PACKAGE}" "Downloading Pandora FMS Server community"
 execute_cmd "curl -LSs --output pandorafms_console-7.0NG.noarch.rpm ${PANDORA_CONSOLE_PACKAGE}" "Downloading Pandora FMS Console community"
-execute_cmd "curl -LSs --output pandorafms_agent_linux-7.0NG.noarch.rpm ${PANDORA_AGENT_PACKAGE}" "Downloading Pandora FMS Agent community"
+execute_cmd "curl -LSs --output pandorafms_agent_linux-7.0NG.tar.gz ${PANDORA_AGENT_PACKAGE}" "Downloading Pandora FMS Agent community"
 
 # Install Pandora
-execute_cmd "dnf install -y $HOME/pandora_deploy_tmp/pandorafms_console*.rpm $HOME/pandora_deploy_tmp/pandorafms_agent*.rpm" "Installing Pandora FMS packages"
-execute_cmd "rpm -i --nodeps $HOME/pandora_deploy_tmp/pandorafms_server-7.0NG.noarch.rpm " "Installing Pandora FMS Server package"
+execute_cmd "dnf install -y $HOME/pandora_deploy_tmp/pandorafms_console*.rpm $HOME/pandora_deploy_tmp/pandorafms_server-7.0NG.noarch.rpm" "Installing Pandora FMS packages"
+
+# Install Pandora Agent
+tar xvfz $HOME/pandora_deploy_tmp/pandorafms_agent_linux-7.0NG.tar.gz &>> $LOGFILE && cd unix && ./pandora_agent_installer --install &>> $LOGFILE ; cd - &>> $LOGFILE
 
 # Enable Services
 execute_cmd "systemctl enable httpd --now" "Enabling HTTPD service"
diff --git a/extras/deploy-scripts/pandora_deploy_community_gh.sh b/extras/deploy-scripts/pandora_deploy_community_gh.sh
index 56fb76ac51..4c2702cd1d 100644
--- a/extras/deploy-scripts/pandora_deploy_community_gh.sh
+++ b/extras/deploy-scripts/pandora_deploy_community_gh.sh
@@ -425,19 +425,22 @@ EO_CONFIG_F
 fi
 export MYSQL_PWD=$DBPASS
 
-#Define packages
-[ "$PANDORA_SERVER_PACKAGE" ]       || PANDORA_SERVER_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_server-7.0NG.772.x86_64.rpm"
-[ "$PANDORA_CONSOLE_PACKAGE" ]      || PANDORA_CONSOLE_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_console-7.0NG.772.noarch.rpm"
-[ "$PANDORA_AGENT_PACKAGE" ]        || PANDORA_AGENT_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_agent_linux-7.0NG.772.noarch.rpm"
+# packages
 
+[ "$PANDORA_SERVER_PACKAGE" ]       || PANDORA_SERVER_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_server-7.0NG.777.x86_64.rpm"
+[ "$PANDORA_CONSOLE_PACKAGE" ]      || PANDORA_CONSOLE_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_console-7.0NG.777.x86_64.rpm"
+[ "$PANDORA_AGENT_PACKAGE" ]        || PANDORA_AGENT_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_agent_linux-7.0NG.777_x86_64.tar.gz"
 
 # Downloading Pandora Packages
 execute_cmd "curl -LSs --output pandorafms_server-7.0NG.noarch.rpm ${PANDORA_SERVER_PACKAGE}" "Downloading Pandora FMS Server community"
 execute_cmd "curl -LSs --output pandorafms_console-7.0NG.noarch.rpm ${PANDORA_CONSOLE_PACKAGE}" "Downloading Pandora FMS Console community"
-execute_cmd "curl -LSs --output pandorafms_agent_linux-7.0NG.noarch.rpm ${PANDORA_AGENT_PACKAGE}" "Downloading Pandora FMS Agent community"
+execute_cmd "curl -LSs --output pandorafms_agent_linux-7.0NG.tar.gz ${PANDORA_AGENT_PACKAGE}" "Downloading Pandora FMS Agent community"
 
 # Install Pandora
-execute_cmd "yum install -y $HOME/pandora_deploy_tmp/pandorafms*.rpm" "installing PandoraFMS packages"
+execute_cmd "yum install -y $HOME/pandora_deploy_tmp/pandorafms*.rpm" "Installing Pandora FMS packages"
+
+# Install Pandora Agent
+tar xvfz $HOME/pandora_deploy_tmp/pandorafms_agent_linux-7.0NG.tar.gz &>> $LOGFILE && cd unix && ./pandora_agent_installer --install &>> $LOGFILE ; cd - &>> $LOGFILE
 
 # Enable Services
 execute_cmd "systemctl enable mysqld --now" "Enabling Database service"
diff --git a/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204_gh.sh b/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204_gh.sh
index f5c6ff3a58..d16c869985 100644
--- a/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204_gh.sh
+++ b/extras/deploy-scripts/pandora_deploy_community_ubuntu_2204_gh.sh
@@ -345,7 +345,7 @@ execute_cmd "apt install -y $server_dependencies" "Installing Pandora FMS Server
 execute_cmd "installing_docker" "Installing Docker for debug"
 
 # Installing pandora_gotty
-execute_cmd "curl --output pandora_gotty.deb https://github.com/pandorafms/pandorafms/releases/download/tools/pandora_gotty_1.1.0.deb" "Downloading pandora_gotty"
+execute_cmd "curl -L --output pandora_gotty.deb https://github.com/pandorafms/pandorafms/releases/download/tools/pandora_gotty_1.1.0.deb" "Downloading pandora_gotty"
 execute_cmd "apt install -y ./pandora_gotty.deb" "Intalling pandora_gotty"
 
 # create symlink for fping
@@ -466,10 +466,9 @@ execute_cmd "systemctl restart mysql" "Configuring and restarting database engin
 
 #Define packages
 
-PANDORA_SERVER_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_server-7.0NG.772_x86_64.tar.gz"
-PANDORA_CONSOLE_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_console-7.0NG.772.tar.gz"
-PANDORA_AGENT_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v772-LTS/pandorafms_agent_linux-7.0NG.772.tar.gz"
-
+PANDORA_SERVER_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_server-7.0NG.777.tar.gz"
+PANDORA_CONSOLE_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_console-7.0NG.777.tar.gz"
+PANDORA_AGENT_PACKAGE="https://github.com/pandorafms/pandorafms/releases/download/v777-LTS/pandorafms_agent_linux-7.0NG.777.tar.gz"
 
 # Downloading Pandora Packages
 cd $WORKDIR &>> "$LOGFILE"
@@ -496,11 +495,6 @@ echo -en "${cyan}Installing PandoraFMS Agent...${reset}"
     tar xvzf $WORKDIR/pandorafms_agent_linux-7.0NG.tar.gz &>> "$LOGFILE" && cd unix && ./pandora_agent_installer --install &>> $LOGFILE && cp -a tentacle_client /usr/local/bin/ &>> $LOGFILE && cd $WORKDIR
 check_cmd_status "Error installing PandoraFMS Agent"
 
-# Copy gotty utility
-cd $WORKDIR &>> "$LOGFILE"
-execute_cmd "wget https://firefly.pandorafms.com/pandorafms/utils/gotty_linux_amd64.tar.gz" 'Dowloading gotty util'
-tar xvzf gotty_linux_amd64.tar.gz &>> $LOGFILE
-execute_cmd "mv gotty /usr/bin/" 'Installing gotty util'
 
 # Config servicesa
 #Configure apache2